Disable bitmap decoders for GPU specific formats on Android framework

gyp/images.gyp

 # GYP file for images project.
 {
   'targets': [
     {
       'target_name': 'images',
       'product_name': 'skia_images',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'libjpeg.gyp:*',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
       ],
-      'conditions': [
-        [ 'skia_android_framework == 0', {
-          'export_dependent_settings': [
-            'libjpeg.gyp:*',
-          ],
-        }],
-      ],
       'include_dirs': [
         '../include/images',
         '../src/lazy',
         # for access to SkErrorInternals.h
         '../src/core/',
         # for access to SkImagePriv.h
         '../src/image/',
       ],
       'sources': [
         '../include/images/SkDecodingImageGenerator.h',
@@ skipping 100 matching lines @@
           'include_dirs': [
              '../src/utils',
           ],
           'dependencies': [
              'android_deps.gyp:gif',
              'android_deps.gyp:png',
           ],
           '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',
               ],
             }],
           ],
         }],
         [ 'skia_os == "chromeos"', {
           'dependencies': [
              'chromeos_deps.gyp:gif',
              'libpng.gyp:libpng',
           ],
         }],
         [ 'skia_os == "ios"', {
            'include_dirs': [
              '../include/utils/mac',
            ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/images',
         ],
       },
     },
   ],
 }