Build libmonochrome.so with secondary toolchain

build/config/android/config.gni

Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 24852d555dd061c2b5f145b352fbc933aea0a8ad..d1c2322e79f9c39f4ebf77e88b22fad3825a06e1 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -266,11 +266,10 @@ if (is_android) {
 
   # ABI ------------------------------------------------------------------------
 
-  # Intentionally do not define android_app_secondary_abi for 64-bit
+  # Intentionally do not define android_app_secondary_abi for 32-bit
   # android_app_abi, since they are not used.
   if (current_cpu == "x86") {
     android_app_abi = "x86"
-    android_app_secondary_abi = "x86_64"
   } else if (current_cpu == "arm") {
     import("//build/config/arm.gni")
     if (arm_version < 7) {
@@ -278,16 +277,17 @@ if (is_android) {
     } else {
       android_app_abi = "armeabi-v7a"
     }
-    android_app_secondary_abi = "arm64-v8a"
   } else if (current_cpu == "mipsel") {
     android_app_abi = "mips"
-    android_app_secondary_abi = "mips64"
   } else if (current_cpu == "x64") {
     android_app_abi = "x86_64"
+    android_app_secondary_abi = "x86"
   } else if (current_cpu == "arm64") {
     android_app_abi = "arm64-v8a"
+    android_app_secondary_abi = "armeabi-v7a"
   } else if (current_cpu == "mips64el") {
     android_app_abi = "mips64"
+    android_app_secondary_abi = "mips"
   } else {
     assert(false, "Unknown Android ABI: " + current_cpu)
   }
@@ -295,4 +295,35 @@ if (is_android) {
   if (android_libcpp_lib_dir == "") {
     android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
   }
+
+  # Secondary ABI -------------------------------------------------------------
+  if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el") {
+    android_64bit_target_cpu = true
+  } else if (target_cpu == "arm" || target_cpu == "x86" ||
+             target_cpu == "mipsel") {
+    android_64bit_target_cpu = false
+  } else {
+    assert(false, "Unknown target CPU: $target_cpu")
+  }
+
+  # Intentionally do not define android_app_secondary_abi_cpu for 32-bit
+  # target_cpu, since they are not used.
+  if (target_cpu == "arm64") {
+    android_secondary_abi_cpu = "arm"

[agrieve, 2016/07/21 16:57:46]

nit: can you add a comments saying why these are keyed off of target_cpu as
opposed to android_app_secondary_abi, which is keyed off of current_cpu?

[michaelbai, 2016/07/21 19:21:08]

I thought twice, it is actually better to move them here.

+  } else if (target_cpu == "x64") {
+    android_secondary_abi_cpu = "x86"
+  } else if (target_cpu == "mips64el") {
+    android_secondary_abi_cpu = "mipsel"
+  }
+
+  if (defined(android_secondary_abi_cpu)) {
+    _android_secondary_abi_cpu_with_v8 =
+        "${android_secondary_abi_cpu}_v8_${android_secondary_abi_cpu}"
+    if (is_clang) {
+      android_secondary_abi_toolchain = "//build/toolchain/android:clang_${_android_secondary_abi_cpu_with_v8}"
+    } else {
+      android_secondary_abi_toolchain =
+          "//build/toolchain/android:${_android_secondary_abi_cpu_with_v8}"
+    }
+  }
 }