Disable bitmap decoders for GPU specific formats on Android framework

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 3cc66a0adb9dc05a39affef25bead39811c43723..13cf3bbf9a8c1aff95940c72d98d34558b32fc40 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!': [

[robertphillips, 2014/08/27 20:15:48]

I thought Android did support ETC1 compressed images (i.e., pkm files).

+                '../src/images/SkImageDecoder_pkm.cpp',
+                '../src/images/SkImageDecoder_ktx.cpp',
+                '../src/images/SkImageDecoder_astc.cpp',
               ],
             }],
           ],