Reenable yasm for Android x86 and x86-64 on Linux

gyp/libjpeg-turbo.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
   'variables': {
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/libjpeg-turbo',
@@ skipping 107 matching lines @@
         ],
       },
       'msvs_disabled_warnings': [4018, 4101],
       # VS2010 does not correctly incrementally link obj files generated
       # from asm files. This flag disables UseLibraryDependencyInputs to
       # avoid this problem.
       'msvs_2010_disable_uldi_when_referenced': 1,
 
       # Add target-specific source files.
       'conditions': [
-        # FIXME (msarett): Reenable yasm on Android for x86 and x86_64
-        # https://code.google.com/p/skia/issues/detail?id=4028
-        [ 'skia_os == "android" and "x86" in skia_arch_type', {
-          'sources': [
-            '../third_party/externals/libjpeg-turbo/jsimd_none.c',
-          ],
+        # TODO (msarett): Is it possible to enable cross compiling for Android on other platforms?
+        [ 'skia_os == "android" and host_os != "linux" and "x86" in skia_arch_type', {
+           'sources': [
+             '../third_party/externals/libjpeg-turbo/jsimd_none.c',
+           ],
         }],
-        [ 'skia_arch_type == "x86" and skia_os != "android"', {
+        [ 'skia_arch_type == "x86" and (skia_os != "android" or host_os == "linux")', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
@@ skipping 17 matching lines @@
             '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
             '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
           ],
         }],
-        [ 'skia_arch_type == "x86_64" and skia_os != "android"', {
+        [ 'skia_arch_type == "x86_64" and (skia_os != "android" or host_os == "linux")', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2-64.asm',
@@ skipping 66 matching lines @@
                 'yasm_flags': [
                   '-D__x86_64__',
                   '-DWIN64',
                   '-DMSVC',
                   '-Iwin/'
                 ],
               }],
             ],
           },
         }],
-        [ 'skia_os == "android" and (skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
+        [ 'skia_os == "android" and host_os == "linux" and \
+          (skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
+          'dependencies': [
+            'yasm.gyp:yasm#host',
+          ],
           'variables': {
-            'yasm_path': '../third_party/yasm/config/android/yasm',
+            'yasm_path': '<(PRODUCT_DIR)/yasm',
             'conditions': [
               [ 'skia_arch_type == "x86"', {
                 'yasm_format': '-felf',
                 'yasm_flags': [
                   '-D__x86__',
                   '-DELF',
                   '-Ilinux/'
                 ],
               }, {
                 'yasm_format': '-felf64',
@@ skipping 81 matching lines @@
               ],
               'process_outputs_as_sources': 1,
               'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
             }],
           ]
         },
       ],
     },
   ],
 }