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

build/config/android/rules.gni

 # Copyright 2014 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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1432 matching lines @@
       _chromium_linker_dep += [ "//build/android:cpplib_stripped" ]
     }
 
     # Allow native_libs to be in the form "foo.so" or "foo.cr.so"
     _first_ext_removed =
         process_file_template(invoker.native_libs, "{{source_name_part}}")
     _native_libs += process_file_template(
             _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 +=
           [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
     }
 
     _enable_relocation_packing = false
     if (_use_chromium_linker && defined(invoker.enable_relocation_packing) &&
         invoker.enable_relocation_packing) {
       _enable_relocation_packing = true
@@ skipping 762 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }