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..993050254339d296e5126cb2b1525f8491eb51aa 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -4,6 +4,8 @@
 
 # This file contains common system config stuff for the Android build.
 
+import("//build/config/android/secondary_abi.gni")

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

Having this as a separate file doesn't really make sense to me if it's just
going to be imported by the main config.gni. I think either:
1. Don't have it imported here, or
2. Inline into the logic below.

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

It was used in more than one place, moved into this file. 

+
 if (is_android) {
   assert(rebase_path("//", root_build_dir) == "../../",
          "Android output directory must be nested 2 levels within src/ (" +
@@ -266,11 +268,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 +279,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"

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

If we're going to have a separate file for secondary_abi things, this value
should probably be defined there.

   } 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)
   }