diff options
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', ], }], ], |