GN: Have android_apk always look for stripped libraries.

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("//tools/grit/grit_rule.gni")
 import("//tools/relocation_packer/config.gni")
 
@@ skipping 975 matching lines @@
     }
 
     _enable_relocation_packing = false
     if (defined(invoker.enable_relocation_packing) &&
         invoker.enable_relocation_packing) {
       _enable_relocation_packing = relocation_packing_supported
       assert(_use_chromium_linker, "Relocation packing requires use of the" +
           " Chromium linker.")
     }
 
-    _native_libs = invoker.native_libs
+    _native_libs = process_file_template(
+        invoker.native_libs,
+        "$root_build_dir/lib.stripped/{{source_file_part}}")
+
     _native_libs_dir = base_path + "/libs"
 
     if (_use_chromium_linker) {
       _native_libs += [
         "$root_build_dir/lib.stripped/libchromium_android_linker.so"
       ]
     }
 
     _enable_relocation_packing = false
     if (_use_chromium_linker && defined(invoker.enable_relocation_packing) &&
@@ skipping 206 matching lines @@
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
 #     the underlying android_apk invocation and should include the java and
 #     resource dependencies of the apk.
 #   unittests_dep: This should be the label of the gtest native target. This
 #     target must be defined previously in the same file.
-#   unittests_binary: The name of the binary produced by the unittests_dep
-#     target, relative to the root build directory. If unspecified, it assumes
-#     the name of the unittests_dep target (which will be correct unless that
-#     target specifies an "output_name".
+#   unittests_binary: The basename of the library produced by the unittests_dep
+#     target. If unspecified, it assumes the name of the unittests_dep target
+#     (which will be correct unless that target specifies an "output_name".
 #     TODO(brettw) make this automatic by allowing get_target_outputs to
 #     support executables.
 #
 # Example
 #   unittest_apk("foo_unittests_apk") {
 #     deps = [ ":foo_java", ":foo_resources" ]
 #     unittests_dep = ":foo_unittests"
 #   }
 template("unittest_apk") {
   testonly = true
 
   assert(defined(invoker.unittests_dep), "Need unittests_dep for $target_name")
 
   test_suite_name = get_label_info(invoker.unittests_dep, "name")
 
   if (defined(invoker.unittests_binary)) {
-    unittests_binary = root_out_dir + "/" + invoker.unittests_binary
+    unittests_binary = invoker.unittests_binary
   } else {
-    unittests_binary = root_out_dir + "/lib.stripped/lib" + test_suite_name + ".so"
+    unittests_binary = "lib" + test_suite_name + ".so"
   }
 
   android_apk(target_name) {
     _apk_name = test_suite_name
     final_apk_path = "$root_build_dir/${_apk_name}_apk/${_apk_name}-debug.apk"
     java_files = [
       "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java"
     ]
     android_manifest = "//testing/android/java/AndroidManifest.xml"
-    unittests_outputs = [ unittests_binary ]
-    native_libs = [unittests_outputs[0]]
+    native_libs = [ unittests_binary ]
     deps = [ "//base:base_java" ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
     datadeps = [
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
   }
 }
@@ skipping 202 matching lines @@
 }
 
 # TODO(GYP): implement this.
 template("uiautomator_test") {
   if (defined(invoker.testonly)) { testonly = invoker.testonly }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }