Add android_libcpp_lib_dir gn arg

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 1009801ce2febfc7da0095bf584a57af4cd9914b..d2dc9886ac18c71c6b52b193decf27d7d42b80ab 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -50,6 +50,9 @@ if (is_android) {
     android_sdk_version = default_android_sdk_version
     android_sdk_build_tools_version = default_android_sdk_build_tools_version
 
+    # Libc++ library dir override to use a custom libc++ binary.
+    android_libcpp_lib_dir_override = ""

[agrieve, 2016/04/06 14:28:44]

I don't think it's common / necessary to have "override" in the name here. It's
just causing two new global variables to exist.

Instead, call it "android_libcpp_lib_dir",

then below, set it to the default if it's ""

+
     # Android versionCode for android_apk()s that don't expclitly set one.
     android_default_version_code = "1"
 
@@ -257,4 +260,10 @@ if (is_android) {
   } else {
     assert(false, "Unknown Android ABI: " + current_cpu)
   }
+
+  if (android_libcpp_lib_dir_override != "") {
+    android_libcpp_lib_dir = android_libcpp_lib_dir_override
+  } else {
+    android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
+  }
 }