diff options
| author |  msarett <msarett@google.com> | 2015-07-22 09:08:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-22 09:08:28 -0700 |
| commit | 551369163fcf149a53f26f82039f0d23854ddc94 (patch) | |
| tree | c846d1a08d60948561fb98fe8680646ddd2ca437 /gyp | |
| parent | 3fc656006c8bcbdca069b1b0f500f3c7311e5e5a (diff) | |
Fix Android framework build
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
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/codec.gyp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp index c008590dad..041d7d1232 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -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', ], |