Remove dependencies on Android's forked decoder libraries

platform_tools/android/gyp/dependencies.gypi

Index: platform_tools/android/gyp/dependencies.gypi
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index f6298c1558da8ca283db47384a902829b24f764a..3be8542e11b7b65bbabd386cf2922c124e21a576 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -89,158 +89,6 @@
       }
     },
     {
-      'target_name': 'png',
-      'type': 'static_library',
-      'sources': [
-        '../third_party/externals/png/png.c',
-        '../third_party/externals/png/pngerror.c',
-        '../third_party/externals/png/pnggccrd.c',
-        '../third_party/externals/png/pngget.c',
-        '../third_party/externals/png/pngmem.c',
-        '../third_party/externals/png/pngpread.c',
-        '../third_party/externals/png/pngread.c',
-        '../third_party/externals/png/pngrio.c',
-        '../third_party/externals/png/pngrtran.c',
-        '../third_party/externals/png/pngrutil.c',
-        '../third_party/externals/png/pngset.c',
-        '../third_party/externals/png/pngtrans.c',
-        '../third_party/externals/png/pngvcrd.c',
-        '../third_party/externals/png/pngwio.c',
-        '../third_party/externals/png/pngwrite.c',
-        '../third_party/externals/png/pngwtran.c',
-        '../third_party/externals/png/pngwutil.c',
-      ],
-      'include_dirs': [
-        '../third_party/externals/png',
-      ],
-      'cflags': [
-        '-w',
-        '-fvisibility=hidden',
-      ],
-      'link_settings': {
-        'libraries': [
-          '-lz',
-        ],
-      },
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/png',
-        ],
-      }
-    },
-    {
-      'target_name': 'jpeg',
-      'type': 'static_library',
-      'dependencies': [
-        'ashmem'
-      ],
-      'sources': [
-        '../third_party/externals/jpeg/jcapimin.c',
-        '../third_party/externals/jpeg/jcapistd.c',
-        '../third_party/externals/jpeg/jccoefct.c',
-        '../third_party/externals/jpeg/jccolor.c',
-        '../third_party/externals/jpeg/jcdctmgr.c',
-        '../third_party/externals/jpeg/jchuff.c',
-        '../third_party/externals/jpeg/jcinit.c',
-        '../third_party/externals/jpeg/jcmainct.c',
-        '../third_party/externals/jpeg/jcmarker.c',
-        '../third_party/externals/jpeg/jcmaster.c',
-        '../third_party/externals/jpeg/jcomapi.c',
-        '../third_party/externals/jpeg/jcparam.c',
-        '../third_party/externals/jpeg/jcphuff.c',
-        '../third_party/externals/jpeg/jcprepct.c',
-        '../third_party/externals/jpeg/jcsample.c',
-        '../third_party/externals/jpeg/jctrans.c',
-        '../third_party/externals/jpeg/jdapimin.c',
-        '../third_party/externals/jpeg/jdapistd.c',
-        '../third_party/externals/jpeg/jdatadst.c',
-        '../third_party/externals/jpeg/jdatasrc.c',
-        '../third_party/externals/jpeg/jdcoefct.c',
-        '../third_party/externals/jpeg/jdcolor.c',
-        '../third_party/externals/jpeg/jddctmgr.c',
-        '../third_party/externals/jpeg/jdhuff.c',
-        '../third_party/externals/jpeg/jdinput.c',
-        '../third_party/externals/jpeg/jdmainct.c',
-        '../third_party/externals/jpeg/jdmarker.c',
-        '../third_party/externals/jpeg/jdmaster.c',
-        '../third_party/externals/jpeg/jdmerge.c',
-        '../third_party/externals/jpeg/jdphuff.c',
-        '../third_party/externals/jpeg/jdpostct.c',
-        '../third_party/externals/jpeg/jdsample.c',
-        '../third_party/externals/jpeg/jdtrans.c',
-        '../third_party/externals/jpeg/jerror.c',
-        '../third_party/externals/jpeg/jfdctflt.c',
-        '../third_party/externals/jpeg/jfdctfst.c',
-        '../third_party/externals/jpeg/jfdctint.c',
-        '../third_party/externals/jpeg/jidctflt.c',
-        '../third_party/externals/jpeg/jidctfst.c',
-        '../third_party/externals/jpeg/jidctint.c',
-        '../third_party/externals/jpeg/jidctred.c',
-        '../third_party/externals/jpeg/jmem-ashmem.c',
-        '../third_party/externals/jpeg/jmemmgr.c',
-        '../third_party/externals/jpeg/jquant1.c',
-        '../third_party/externals/jpeg/jquant2.c',
-        '../third_party/externals/jpeg/jutils.c',
-      ],
-      'conditions': [
-        # FIXME (msarett):
-        # Turn off Arm NEON optimizations to avoid namespace conflicts when
-        # compiling libjpeg and libjpeg-turbo.  This is a temporary step in the
-        # plan to replace libjpeg with libjpeg-turbo.
-        #[ 'arm_neon == 1 and skia_clang_build == 0',
-        #  {
-        #    'sources' : [
-        #      '../third_party/externals/jpeg/armv6_idct.S',
-        #      '../third_party/externals/jpeg/jsimd_arm_neon.S',
-        #      '../third_party/externals/jpeg/jsimd_neon.c',
-        #    ],
-        #    'defines' : [
-        #      'NV_ARM_NEON',
-        #    ],
-        #  },
-        #],
-        [ '"mips" in skia_arch_type and mips_dsp == 2',
-          {
-            'sources' : [
-              '../third_party/externals/jpeg/mips_jidctfst.c',
-              '../third_party/externals/jpeg/mips_idct_le.S',
-            ],
-            'defines' : [
-              'ANDROID_MIPS_IDCT',
-            ],
-          },
-        ],
-        [ '"x86" in skia_arch_type',
-          {
-            'sources' : [
-              '../third_party/externals/jpeg/jidctintelsse.c',
-            ],
-            'defines' : [
-              'ANDROID_INTELSSE2_IDCT',
-            ],
-          },
-        ],
-      ],
-      'include_dirs': [
-        '../third_party/externals/jpeg',
-      ],
-      'cflags': [
-        '-w',
-        '-fvisibility=hidden',
-        '-DAVOID_TABLES',
-        '-DUSE_ANDROID_ASHMEM',
-        '-O3',
-        '-fstrict-aliasing',
-        '-fprefetch-loop-arrays',
-        '-DANDROID_TILE_BASED_DECODE',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../third_party/externals/jpeg',
-        ],
-      }
-    },
-    {
       # This target is a dependency for all console-type Skia applications which
       # will run on Android.  Since Android requires us to load native code in
       # shared libraries, we need a common entry point to wrap around main().