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

build/toolchain/android/BUILD.gn

Index: build/toolchain/android/BUILD.gn
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
index 087f04b3506331bd1d6c631f49074f03ffea449e..12b657b435583b852a10e092407e861d4a431961 100644
--- a/build/toolchain/android/BUILD.gn
+++ b/build/toolchain/android/BUILD.gn
@@ -55,9 +55,9 @@ template("android_gcc_toolchain") {
     toolchain_os = "android"
     toolchain_cpu = invoker.toolchain_cpu
 
-    # We make the assumption that the gcc_toolchain will produce a soname with
-    # the following definition.
+    # Use the same soname and sofile as gcc_toolchain
     soname = "{{target_output_name}}{{output_extension}}"
+    sofile = "{{root_out_dir}}/lib/$soname"
 
     stripped_soname = "lib.stripped/${soname}"
     temp_stripped_soname = "${stripped_soname}.tmp"
@@ -65,11 +65,10 @@ template("android_gcc_toolchain") {
     android_strip = "${tool_prefix}strip"
 
     strip_command =
-        "$android_strip --strip-unneeded -o $temp_stripped_soname $soname"
+        "$android_strip --strip-unneeded -o $temp_stripped_soname $sofile"
     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.