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
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 3cc66a0..13cf3bb 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',
],
}],
],
