GN: Update heap stubs for android

Source/platform/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//third_party/WebKit/Source/build/scripts/scripts.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/platform/platform.gni")
 import("//third_party/WebKit/Source/platform/platform_generated.gni")
-import("//third_party/yasm/yasm_assemble.gni")
 
 # Most targets in this file are private actions so use that as the default.
 visibility = ":*"
 
 heap_gypi = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("heap/blink_heap.gypi") ],
     "scope",
     [ "heap/blink_heap.gypi" ])
 
@@ skipping 306 matching lines @@
     include_dirs += [ "//third_party/ffmpeg" ]
     deps += [ "//third_party/ffmpeg" ]
   }
   if (use_openmax_dl_fft) {
     include_dirs += [ "//third_party/openmax_dl" ]
     # TODO(GYP)
     # deps += [ "//third_party/openmax_dl/dl" ]
   }
 }
 
+if (cpu_arch == "x86" || cpu_arch == "x64") {
+import("//third_party/yasm/yasm_assemble.gni")
+
 yasm_assemble("heap_asm_stubs") {
-  if (cpu_arch == "x86" || cpu_arch == "x64") {
-    sources = [ "heap/asm/SaveRegisters_x86.asm" ]
-  } else if (cpu_arch == "arm") {
-    sources = [ "heap/asm/SaveRegisters_arm.S" ]
-  } else if (cpu_arch == "arm64") {
-    sources = [ "heap/asm/SaveRegisters_arm64.S" ]
-  } else if (cpu_arch == "mipsel") {
-    sources = [ "heap/asm/SaveRegisters_mips.S" ]
-  }
+  assert(cpu_arch == "x86" || cpu_arch == "x64")
+
+  sources = [ "heap/asm/SaveRegisters_x86.asm" ]
 
   yasm_flags = []
   if (is_mac) {
     # Necessary to ensure symbols end up with a _ prefix; added by
     # yasm_compile.gypi for Windows, but not Mac.
     yasm_flags += [ "-DPREFIX" ]
   }
   if (cpu_arch == "x64") {
     if (is_win) {
       yasm_flags += [ "-DX64WIN=1" ]
     } else {
       yasm_flags += [ "-DX64POSIX=1" ]
     }
-  } else if (cpu_arch == "x86") {
+  } else {  # cpu_arch == "x86"
     yasm_flags += [ "-DIA32=1" ]
-  } else if (cpu_arch == "arm") {
-    yasm_flags += [ "-DARM=1" ]
   }
 }
 
+} else { # cpu_arch == "x86" || cpu_arch == "x64"
+
+source_set("heap_asm_stubs") {
+  if (cpu_arch == "arm") {
+    sources = [ "heap/asm/SaveRegisters_arm.S" ]
+  } else if (cpu_arch == "arm64") {
+    sources = [ "heap/asm/SaveRegisters_arm64.S" ]
+  } else if (cpu_arch == "mipsel") {
+    sources = [ "heap/asm/SaveRegisters_mips.S" ]
+  }
+
+  if (cpu_arch == "arm") {
+    defines = [ "ARM=1" ]
+  }
+
+}
+
+} # cpu_arch == "x86" || cpu_arch == "x64"
+
 
 test("heap_unittests") {
   visibility = "//third_party/WebKit/*"
   output_name = "blink_heap_unittests"
 
   sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap")
   sources += [ "heap/RunAllTests.cpp" ]
 
   configs += [
     "//third_party/WebKit/Source/wtf:wtf_config",
@@ skipping 60 matching lines @@
     #'cflags': ['-marm'],
     #    'conditions': [
     #      ['OS=="android"', {
     #        'cflags!': ['-mthumb'],
     #      }],
     #    ],
 
     deps = [ ":blink_common" ]
   }
 }