Do not try to compile x86 and x86_64 .asm files on Android

gyp/libjpeg-turbo.gyp

Index: gyp/libjpeg-turbo.gyp
diff --git a/gyp/libjpeg-turbo.gyp b/gyp/libjpeg-turbo.gyp
index 25a919fb99ffad17dd51bc9f505f37cf6f61ab4e..42528afa14f8266c62bd81273d9c0ac3a589cf0a 100644
--- a/gyp/libjpeg-turbo.gyp
+++ b/gyp/libjpeg-turbo.gyp
@@ -113,10 +113,19 @@
       # from asm files. This flag disables UseLibraryDependencyInputs to
       # avoid this problem.
       'msvs_2010_disable_uldi_when_referenced': 1,
-      
+
+      # FIXME (msarett): Reenable yasm on Android for x86 and x86_64
+      # https://code.google.com/p/skia/issues/detail?id=4028
+      'conditions': [

[djsollen, 2015/07/09 14:28:47]

this extra conditions block is overkill and it can be folded into the conditions
below.

[msarett, 2015/07/09 14:32:33]

Done.

+        [ 'skia_os == "android" and "x86" in skia_arch_type', {
+          'sources': [
+            '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+          ],
+        }],
+      ],
       # Add target-specific source files.
       'conditions': [
-        [ 'skia_arch_type == "x86"', {
+        [ 'skia_arch_type == "x86" and skia_os != "android"', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
@@ -154,7 +163,7 @@
             '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
           ],
         }],
-        [ 'skia_arch_type == "x86_64"', {
+        [ 'skia_arch_type == "x86_64" and skia_os != "android"', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',