Switching Skia to chromium's 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',
-            ],
-          },
-        ],
+        # 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',
             ],
           },
@@ skipping 112 matching lines @@
           '../../../tools/VisualBench/',
         ],
         'sources': [
           '../apps/visualbench/src/main/jni/SkOSWindow_AndroidNative.cpp',
           '../apps/visualbench/src/main/jni/main.cpp',
         ],
       },
     },
   ]
 }