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

build/toolchain/android/BUILD.gn

 # Copyright 2013 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("//build/config/sysroot.gni")  # Imports android/config.gni.
 import("//build/toolchain/ccache.gni")
 import("//build/toolchain/clang.gni")
 import("//build/toolchain/goma.gni")
 import("//build/toolchain/gcc_toolchain.gni")
 
@@ skipping 46 matching lines @@
       cc = "${compiler_prefix}$prefix/clang"
       cxx = "${compiler_prefix}$prefix/clang++"
     } else {
       cc = "${compiler_prefix}${tool_prefix}gcc"
       cxx = "${compiler_prefix}${tool_prefix}g++"
     }
     ar = tool_prefix + "ar"
     ld = cxx
     readelf = compiler_prefix + tool_prefix + "readelf"
     nm = compiler_prefix + tool_prefix + "nm"
+    strip = "${tool_prefix}strip"
 
     toolchain_os = "android"
     toolchain_cpu = invoker.toolchain_cpu
-
-    # We make the assumption that the gcc_toolchain will produce a soname with
-    # the following definition.
-    soname = "{{target_output_name}}{{output_extension}}"
-
-    stripped_soname = "lib.stripped/${soname}"
-    temp_stripped_soname = "${stripped_soname}.tmp"
-
-    android_strip = "${tool_prefix}strip"
-
-    strip_command =
-        "$android_strip --strip-unneeded -o $temp_stripped_soname $soname"
-    replace_command = "if ! cmp -s $temp_stripped_soname $stripped_soname; then mv $temp_stripped_soname $stripped_soname; fi"
-    postsolink = "$strip_command && $replace_command"
-    solink_outputs = [ stripped_soname ]
-    default_output_extension = android_product_extension
-
-    # We make the assumption that the gcc_toolchain will produce an exe with
-    # the following definition.
-    exe = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}"
-    stripped_exe = "exe.stripped/$exe"
-    postlink = "$android_strip --strip-unneeded -o $stripped_exe $exe"
-    link_outputs = [ stripped_exe ]
   }
 }
 
 template("android_gcc_toolchains_helper") {
   android_gcc_toolchain(target_name) {
     android_ndk_sysroot = invoker.android_ndk_sysroot
     android_ndk_lib_dir = invoker.android_ndk_lib_dir
     tool_prefix = invoker.tool_prefix
     toolchain_cpu = invoker.toolchain_cpu
   }
@@ skipping 47 matching lines @@
   toolchain_cpu = "aarch64"
 }
 
 android_gcc_toolchains_helper("mips64el") {
   android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
   android_ndk_lib_dir = "usr/lib64"
 
   tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
   toolchain_cpu = "mipsel64el"
 }