AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Android framework build

Browse Source 
The Android framework was failing on conditions in
libjpeg-turbo.gyp, even though libjpeg-turbo is listed
in dependencies! for the framework (maybe because I
forgot to add export_dependent_settings!).  This is fixed
by rearranging the gyp file.

BUG=skia:

Review URL: https://codereview.chromium.org/1249003002
This commit is contained in:
msarett 2015-07-22 09:08:28 -07:00 committed by Commit bot
parent 3fc656006c
commit 551369163f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gyp/codec.gyp
View File

@ -18,12 +18,8 @@
'dependencies': [
'core.gyp:*',
'giflib.gyp:giflib',
'libjpeg-turbo.gyp:libjpeg-turbo',
'libwebp.gyp:libwebp',
],
'export_dependent_settings': [
'libjpeg-turbo.gyp:libjpeg-turbo',
],
'cflags':[
# FIXME: This gets around a longjmp warning. See
# http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
@ -63,20 +59,23 @@
'dependencies': [
'libpng.gyp:libpng',
],
# TODO(msarett): update libjpeg-turbo on Android so we can compile SkJpegCodec
# TODO(msarett): Add libjpeg-turbo to Android so we can compile SkJpegCodec
# for the framework.
'sources!': [
'../src/codec/SkJpegCodec.cpp',
'../src/codec/SkJpegDecoderMgr.cpp',
'../src/codec/SkJpegUtility_codec.cpp',
],
'dependencies!': [
'libjpeg-turbo.gyp:libjpeg-turbo',
],
}, { # !skia_android_framework
'dependencies': [
# TODO(msarett): Add libjpeg-turbo to Android so this can be a global
# dependency.
'libjpeg-turbo.gyp:libjpeg-turbo',
'libpng.gyp:libpng_static',
],
'export_dependent_settings': [
'libjpeg-turbo.gyp:libjpeg-turbo',
],
'cflags': [
'-DTURBO_HAS_SKIP',
],