Build libmonochrome.so with secondary toolchain

build/toolchain/android/BUILD.gn

 # Copyright 2013 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/clang/clang.gni")
 import("//build/config/sysroot.gni")  # Imports android/config.gni.
 import("//build/toolchain/gcc_toolchain.gni")
 
 # The Android GCC toolchains share most of the same parameters, so we have this
 # wrapper around gcc_toolchain to avoid duplication of logic.
@@ skipping 41 matching lines @@
     }
     ar = _tool_prefix + "ar"
     ld = cxx
     readelf = _tool_prefix + "readelf"
     nm = _tool_prefix + "nm"
     strip = "${_tool_prefix}strip"
 
     # Don't use .cr.so for loadable_modules since they are always loaded via
     # absolute path.
     loadable_module_extension = ".so"
+
+    if (defined(invoker.v8_toolchain_cpu)) {
+      v8_toolchain_cpu = invoker.v8_toolchain_cpu
+    }
   }
 }
 
 template("android_gcc_toolchains_helper") {
   android_gcc_toolchain(target_name) {
     forward_variables_from(invoker, "*")
   }
 
   android_gcc_toolchain("clang_$target_name") {
     forward_variables_from(invoker, "*")
     is_clang = true
   }
 }
 
-android_gcc_toolchains_helper("x86") {
-  toolchain_cpu = "x86"
-  toolchain_root = x86_android_toolchain_root
-  sysroot = "$android_ndk_root/$x86_android_sysroot_subdir"
-  lib_dir = "usr/lib"
-  binary_prefix = "i686-linux-android"
+template("android_gcc_toolchains_x86_helper") {
+  android_gcc_toolchains_helper(target_name) {
+    toolchain_cpu = "x86"
+    toolchain_root = x86_android_toolchain_root
+    sysroot = "$android_ndk_root/$x86_android_sysroot_subdir"
+    lib_dir = "usr/lib"
+    binary_prefix = "i686-linux-android"
+    forward_variables_from(invoker, "*")
+  }
 }
 
-android_gcc_toolchains_helper("arm") {
-  toolchain_cpu = "arm"
-  toolchain_root = arm_android_toolchain_root
-  sysroot = "$android_ndk_root/$arm_android_sysroot_subdir"
-  lib_dir = "usr/lib"
-  binary_prefix = "arm-linux-androideabi"
+template("android_gcc_toolchains_arm_helper") {
+  android_gcc_toolchains_helper(target_name) {
+    toolchain_cpu = "arm"
+    toolchain_root = arm_android_toolchain_root
+    sysroot = "$android_ndk_root/$arm_android_sysroot_subdir"
+    lib_dir = "usr/lib"
+    binary_prefix = "arm-linux-androideabi"
+    forward_variables_from(invoker, "*")
+  }
 }
 
-android_gcc_toolchains_helper("mipsel") {
-  toolchain_cpu = "mipsel"
-  toolchain_root = mips_android_toolchain_root
-  sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
-  lib_dir = "usr/lib"
-  binary_prefix = "mipsel-linux-android"
+template("android_gcc_toolchains_mipsel_helper") {
+  android_gcc_toolchains_helper(target_name) {
+    toolchain_cpu = "mipsel"
+    toolchain_root = mips_android_toolchain_root
+    sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
+    lib_dir = "usr/lib"
+    binary_prefix = "mipsel-linux-android"
+    forward_variables_from(invoker, "*")
+  }
+}
+
+android_gcc_toolchains_x86_helper("x86") {
+}
+
+android_gcc_toolchains_arm_helper("arm") {
+}
+
+android_gcc_toolchains_arm_helper("mipsel") {
+}
+
+android_gcc_toolchains_arm_helper("arm_v8_arm") {

[agrieve, 2016/07/20 02:11:03]

It's worth a comment about how these are different from the non-v8 ones.

[michaelbai, 2016/07/20 16:51:10]

Done.

+  v8_toolchain_cpu = "arm"
+}
+
+android_gcc_toolchains_arm_helper("mipsel_v8_mipsel") {
+  v8_toolchain_cpu = "mipsel"
+}
+
+android_gcc_toolchains_arm_helper("x86_v8_x86") {
+  v8_toolchain_cpu = "x86"
 }
 
 android_gcc_toolchains_helper("x64") {
   toolchain_cpu = "x86_64"
   toolchain_root = x86_64_android_toolchain_root
   sysroot = "$android_ndk_root/$x86_64_android_sysroot_subdir"
   lib_dir = "usr/lib64"
   binary_prefix = "x86_64-linux-android"
 }
 
 android_gcc_toolchains_helper("arm64") {
   toolchain_cpu = "arm64"
   toolchain_root = arm64_android_toolchain_root
   sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir"
   lib_dir = "usr/lib"
   binary_prefix = "aarch64-linux-android"
 }
 
 android_gcc_toolchains_helper("mips64el") {
   toolchain_cpu = "mips64el"
   toolchain_root = mips64_android_toolchain_root
   sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
   lib_dir = "usr/lib64"
   binary_prefix = "mips64el-linux-android"
 }