diff options
author | 2014-02-05 16:35:12 +0000 | |
---|---|---|
committer | 2014-02-05 16:35:12 +0000 | |
commit | d4adfa37fb33fa0779da6401d7befbee14bb49df (patch) | |
tree | 6284bb409a93e8f3b55dbae24ad0d438f7d46d2c /gyp/images.gyp | |
parent | 8a13588b6f41ba892bcf6e8ceef6b449c4a5d83d (diff) |
Reland "Gyp file changes for the android framework."
Relands https://codereview.chromium.org/153093003/, which was reverted
with https://skia.googlesource.com/skia.git/+/eb6295044b97db05ec40625dcebc2459b2a38a98
This reverts commit 6b32be1402eb6c549d5ba1db71860e24f9de2991.
BUG=skia:1975
R=djsollen@google.com
Review URL: https://codereview.chromium.org/154053002
git-svn-id: http://skia.googlecode.com/svn/trunk@13321 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/images.gyp')
-rw-r--r-- | gyp/images.gyp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index dedea5179b..fdbf2a0f66 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -12,8 +12,12 @@ 'libwebp.gyp:libwebp', 'utils.gyp:utils', ], - 'export_dependent_settings': [ - 'libjpeg.gyp:*', + 'conditions': [ + [ 'skia_android_framework == 0', { + 'export_dependent_settings': [ + 'libjpeg.gyp:*', + ], + }], ], 'include_dirs': [ '../include/images', @@ -42,16 +46,26 @@ '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_FactoryRegistrar.cpp', + # If decoders are added/removed to/from (all/individual) # platform(s), be sure to update SkForceLinking.cpp # so the right decoders will be forced to link. + + # IMPORTANT: The build order of the SkImageDecoder_*.cpp files + # defines the order image decoders are tested when decoding a + # stream. The last decoder is the first one tested, so the .cpp + # files should be in listed in order from the least likely to be + # used, to the most likely (jpeg and png should be the last two + # for instance.) As a result, they are deliberately not in + # alphabetical order. + '../src/images/SkImageDecoder_wbmp.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', + '../src/images/SkImageDecoder_libwebp.cpp', '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libpng.cpp', - '../src/images/SkImageDecoder_libwebp.cpp', - '../src/images/SkImageDecoder_wbmp.cpp', + '../src/images/SkImageEncoder.cpp', '../src/images/SkImageEncoder_Factory.cpp', '../src/images/SkImageEncoder_argb.cpp', @@ -140,8 +154,12 @@ 'android_deps.gyp:gif', 'android_deps.gyp:png', ], - 'export_dependent_settings': [ - 'android_deps.gyp:png' + 'conditions': [ + [ 'skia_android_framework == 0', { + 'export_dependent_settings': [ + 'android_deps.gyp:png' + ], + }], ], },{ #else if skia_os != android 'sources!': [ |