GN (Android): Fix packaging excess libs when target_cpu is changed

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index f627e43699ec53c375921868f619e07dd789f2cf..3ac5c0bb3b85b66a7d6d03a3a9cc8311469b4d83 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1450,7 +1450,9 @@ template("android_apk") {
             _first_ext_removed,
             "$root_shlib_dir/{{source_name_part}}$shlib_extension")
 
-    _native_libs_dir = base_path + "/libs"
+    # Add in target_cpu so that other architectures are not accidentally
+    # included when switching target_cpu without doing a clean build.
+    _native_libs_dir = gen_dir + "/lib-$target_cpu"

[Dirk Pranke, 2015/08/17 21:17:54]

Brett, is there a better convention for toolchain-specific generated files?

[Dirk Pranke, 2015/08/19 20:14:49]

Brett points out to me that this should actually be okay; ninja should note that
the file was generated by a particular command line, and so if you change the
target_cpu, shouldn't you have a different command line and automatically
rebuild?

 
     if (_use_chromium_linker) {
       _native_libs +=