Switch SkJpegCode to libjpeg-turbo

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 507a16345838edd5ae5c6ed171672b8299a9dd6f..d94656c400e548733388221992e4305e7d1de29b 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -183,29 +183,30 @@
         '../third_party/externals/jpeg/jutils.c',
       ],
       'conditions': [
-        [ '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',
-            ],
-          },
-        ],
-        [ 'skia_arch_type == "mips" and mips_dsp == 2',
-          {
-            'sources' : [
-              '../third_party/externals/jpeg/mips_jidctfst.c',
-              '../third_party/externals/jpeg/mips_idct_le.S',
-            ],
-            'defines' : [
-              'ANDROID_MIPS_IDCT',
-            ],
-          },
-        ],
+        # TODO (msarett): Reenable compiling of assembly files.
+        #[ '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',
+        #    ],
+        #  },
+        #],
+        #[ 'skia_arch_type == "mips" 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' : [
@@ -218,6 +219,7 @@
         ],
       ],
       'include_dirs': [
+        '../third_party/jpeg/',
         '../third_party/externals/jpeg',
       ],
       'cflags': [
@@ -229,9 +231,18 @@
         '-fstrict-aliasing',
         '-fprefetch-loop-arrays',
         '-DANDROID_TILE_BASED_DECODE',
+        # Trick libjpeg into thinking that jpeglib.h has already been included, and then include
+        # our own version that mangles the function names.  This trick prevents us from being able
+        # to compile assembly files.  This should be ok because it is a temporary measure.  When we
+        # want to benchmark decodes with DCT_IFAST on Neon, we will simply remove these flags from
+        # this gyp file and make a one line modification to externals/libjpeg.
+        # TODO (msarett): Reenable compiling of assembly files.
+        '-DJPEGLIB_H',
+        '-include manglejpeglib.h',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
+          '../third_party/jpeg',
           '../third_party/externals/jpeg',
         ],
       }