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

build/toolchain/gcc_toolchain.gni

Index: build/toolchain/gcc_toolchain.gni
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index 3421a9575bda75ed497f57cf2ec3b7e8b3587123..f6448736554e929061dedabdd951b786c7db4d88 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/toolchain/toolchain.gni")
+
 # This value will be inherited in the toolchain below.
 concurrent_links = exec_script("get_concurrent_links.py", [], "value")
 
@@ -134,7 +136,7 @@ template("gcc_toolchain") {
 
     tool("solink") {
       soname = "{{target_output_name}}{{output_extension}}"  # e.g. "libfoo.so".
-      sofile = "{{root_out_dir}}/$soname"  # Possibly including toolchain dir.
+      sofile = "{{root_out_dir}}/lib/$soname"  # Possibly including toolchain dir.

[brettw, 2015/07/30 23:17:46]

Should this be $shlib_subdir ?

[agrieve, 2015/07/31 02:09:24]

No - so added a comment. Problem is that on Android we need it to be "lib"
rather than "lib.stripped"

[brettw, 2015/07/31 03:59:19]

Ah, thanks

       rspfile = sofile + ".rsp"
 
       # These variables are not built into GN but are helpers that implement
@@ -159,7 +161,7 @@ template("gcc_toolchain") {
       # Use this for {{output_extension}} expansions unless a target manually
       # overrides it (in which case {{output_extension}} will be what the target
       # specifies).
-      default_output_extension = ".so"
+      default_output_extension = shlib_extension
       if (defined(invoker.default_output_extension)) {
         default_output_extension = invoker.default_output_extension
       }