Switch SkJpegCode to libjpeg-turbo

platform_tools/android/gyp/dependencies.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 # NOTE: We tried adding the gyp file to the android/ directory at the root of
@@ skipping 165 matching lines @@
         '../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': [
-        [ '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' : [
               '../third_party/externals/jpeg/jidctintelsse.c',
             ],
             'defines' : [
               'ANDROID_INTELSSE2_IDCT',
             ],
           },
         ],
       ],
       'include_dirs': [
+        '../third_party/jpeg/',
         '../third_party/externals/jpeg',
       ],
       'cflags': [
         '-w',
         '-fvisibility=hidden',
         '-DAVOID_TABLES',
         '-DUSE_ANDROID_ASHMEM',
         '-O3',
         '-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',
         ],
       }
     },
     {
       # 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().
       # Here we also change the type of all would-be executables to be shared
       # libraries.  The alternative would be to introduce a condition in every
@@ skipping 74 matching lines @@
           '../../../tools/timer/',
         ],
         'sources': [
           '../visualbench/jni/SkOSWindow_AndroidNative.cpp',
           '../visualbench/jni/main.cpp',
         ],
       },
     },
   ]
 }