GN: Use lib.unstripped rather than lib.stripped. Add a toolchain.gni

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")
 
 assert(is_android)
 
 # Declare a jni target
 #
 # This target generates the native jni bindings for a set of .java files.
 #
 # See base/android/jni_generator/jni_generator.py for more info about the
@@ skipping 1413 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.")
     }
 
     if (is_component_build) {
-      _native_libs += [ "$root_out_dir/lib.stripped/libc++_shared.so" ]
+      _native_libs += [ "$root_shlib_dir/libc++_shared.so" ]
       _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_build_dir/lib.stripped/{{source_name_part}}$android_product_extension")
+            "$root_shlib_dir/{{source_name_part}}$shlib_extension")
 
     _native_libs_dir = base_path + "/libs"
 
     if (_use_chromium_linker) {
-      _native_libs += [ "$root_build_dir/lib.stripped/libchromium_android_linker$android_product_extension" ]
+      _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
     }
 
     _native_lib_version_rule = ""
     if (defined(invoker.native_lib_version_rule)) {
@@ skipping 190 matching lines @@
       ]
 
       inputs = _native_libs
       deps = _chromium_linker_dep
 
       inputs += [ _build_config ]
       deps += [ ":$build_config_target" ]
 
       skip_packing_list = [
         "gdbserver",
-        "libchromium_android_linker$android_product_extension",
+        "libchromium_android_linker$shlib_extension",
       ]
 
       enable_packing_arg = 0
       if (_enable_relocation_packing) {
         enable_packing_arg = 1
         deps += [ relocation_packer_target ]
       }
 
       args = [
         "--depfile",
@@ skipping 263 matching lines @@
 
   test_suite_name = get_label_info(invoker.unittests_dep, "name")
 
   # This trivial assert is needed in case both unittests_binary and apk_name
   # are defined, as otherwise test_suite_name would not be used.
   assert(test_suite_name != "")
 
   if (defined(invoker.unittests_binary)) {
     unittests_binary = invoker.unittests_binary
   } else {
-    unittests_binary = "lib${test_suite_name}${android_product_extension}"
+    unittests_binary = "lib${test_suite_name}${shlib_extension}"
   }
 
   if (defined(invoker.apk_name)) {
     apk_name = invoker.apk_name
   } else {
     apk_name = test_suite_name
   }
 
   android_apk(target_name) {
     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
@@ skipping 113 matching lines @@
 # executable.
 #
 # Variables
 #   dist_dir: Directory for the exe and libraries. Everything in this directory
 #     will be deleted before copying in the exe and libraries.
 #   binary: Path to (stripped) executable.
 #
 # Example
 #   create_native_executable_dist("foo_dist") {
 #     dist_dir = "$root_build_dir/foo_dist"
-#     binary = "$root_build_dir/exe.stripped/foo"
+#     binary = "$root_build_dir/foo"
 #     deps = [ ":the_thing_that_makes_foo" ]
 #   }
 template("create_native_executable_dist") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
   dist_dir = invoker.dist_dir
   binary = invoker.binary
   template_name = target_name
 
   libraries_list =
       "${target_gen_dir}/${template_name}_library_dependencies.list"
 
   find_deps_target_name = "${template_name}__find_library_dependencies"
   copy_target_name = "${template_name}__copy_libraries_and_exe"
 
-  stripped_libraries_dir = "$root_build_dir/lib.stripped"
   action(find_deps_target_name) {
     visibility = [ ":$copy_target_name" ]
 
     script = "//build/android/gyp/write_ordered_libraries.py"
     depfile = "$target_gen_dir/$target_name.d"
     inputs = [
       binary,
       android_readelf,
     ]
     outputs = [
       depfile,
       libraries_list,
     ]
     rebased_binaries = rebase_path([ binary ], root_build_dir)
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--input-libraries=$rebased_binaries",
       "--libraries-dir",
-      rebase_path(stripped_libraries_dir, root_build_dir),
+      rebase_path(root_shlib_dir, root_build_dir),
       "--output",
       rebase_path(libraries_list, root_build_dir),
       "--readelf",
       rebase_path(android_readelf, root_build_dir),
     ]
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
   }
 
@@ skipping 91 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) {
   }
 }