Fix yasm for Android build

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 11 matching lines @@
       'type': 'executable',
       'sources': [
         '../third_party/externals/yasm/binaries/win/yasm.exe',
       ],
       'copies' : [{
         'destination': '<(PRODUCT_DIR)',
         'files': [ '../third_party/externals/yasm/binaries/win/yasm.exe' ],
       }],
     },
     {
+      'target_name': 'yasm-android',
+      'type': 'executable',
+      'sources': [
+        '../third_party/yasm/android/yasm',
+      ],
+      'copies' : [{
+        'destination': '<(PRODUCT_DIR)',
+        'files': [ '../third_party/yasm/android/yasm' ],
+      }],
+    },
+    {
       'target_name': 'libjpeg-turbo',
       'type': 'static_library',
       'include_dirs': [
         '../third_party/externals/libjpeg-turbo/',
       ],
       'defines': [
         'WITH_SIMD',
         'MOTION_JPEG_SUPPORTED',
         'NO_GETENV',
       ],
@@ skipping 200 matching lines @@
                   '-DWIN64',
                   '-DMSVC',
                 ],
               }],
             ],
           },
         }],
         [ 'skia_os == "android" and host_os == "linux" and \
           (skia_arch_type == "x86" or skia_arch_type == "x86_64")', {
           'dependencies': [
-            'yasm.gyp:yasm#host',
+            'yasm-android',
           ],
           'variables': {
             'yasm_path': '<(PRODUCT_DIR)/yasm',
             'conditions': [
               [ 'skia_arch_type == "x86"', {
                 'yasm_format': '-felf',
                 'yasm_flags': [
                   '-D__x86__',
                   '-DELF',
                   '-DPIC',
@@ skipping 81 matching lines @@
               ],
               'process_outputs_as_sources': 1,
               'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
             }],
           ]
         },
       ],
     },
   ],
 }