diff options
| author |  djsollen <djsollen@google.com> | 2014-08-28 05:41:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-28 05:41:21 -0700 |
| commit | 38e44b06b246cfb06c11a18d552913ccee4a4440 (patch) | |
| tree | a2c7d20a1a947746d7aa683ceedcc9ad2a49a4d8 /gyp | |
| parent | 7b3d5ee72c2238aa239bce4d5b3aea98a437ca7a (diff) | |
Disable bitmap decoders for GPU specific formats on Android framework
R=reed@google.com, robertphillips@google.com, scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/510913003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/images.gyp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gyp/images.gyp b/gyp/images.gyp index 3cc66a0adb..13cf3bbf9a 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -14,13 +14,6 @@ 'libwebp.gyp:libwebp', 'utils.gyp:utils', ], - 'conditions': [ - [ 'skia_android_framework == 0', { - 'export_dependent_settings': [ - 'libjpeg.gyp:*', - ], - }], - ], 'include_dirs': [ '../include/images', '../src/lazy', @@ -141,7 +134,16 @@ 'conditions': [ [ 'skia_android_framework == 0', { 'export_dependent_settings': [ - 'android_deps.gyp:png' + 'android_deps.gyp:png', + 'libjpeg.gyp:*' + ], + }, { + # The android framework disables these decoders as they are of little use to + # Java applications that can't take advantage of the compressed formats. + 'sources!': [ + '../src/images/SkImageDecoder_pkm.cpp', + '../src/images/SkImageDecoder_ktx.cpp', + '../src/images/SkImageDecoder_astc.cpp', ], }], ], |