Synchronize GN build configuration with Chrome

build/toolchain/nacl/BUILD.gn

Index: build/toolchain/nacl/BUILD.gn
diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn
index 686960297d403f7725801860811a5c6aee67d5ce..5329f188a418e44498d3710474d62072c0768949 100644
--- a/build/toolchain/nacl/BUILD.gn
+++ b/build/toolchain/nacl/BUILD.gn
@@ -3,11 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/sysroot.gni")
+import("//build/config/nacl/config.gni")
 import("//build/toolchain/nacl_toolchain.gni")
 
-nacl_toolchain_dir = rebase_path("//native_client/toolchain", root_build_dir)
-os_toolchain_dir = "${nacl_toolchain_dir}/${host_os}_x86"
-
 # Add the toolchain revision as a preprocessor define so that sources are
 # rebuilt when a toolchain is updated.
 # Idea we could use the toolchain deps feature, but currently that feature is
@@ -28,7 +26,9 @@ nacl_toolchain("newlib_pnacl") {
   toolchain_package = "pnacl_newlib"
   toolchain_revision = pnacl_newlib_rev
   toolchain_cpu = "pnacl"
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/pnacl-"
+  toolprefix =
+      rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/pnacl-",
+                  root_build_dir)
 
   cc = toolprefix + "clang"
   cxx = toolprefix + "clang++"
@@ -48,7 +48,9 @@ nacl_toolchain("glibc_x86") {
   toolchain_package = "nacl_x86_glibc"
   toolchain_revision = nacl_x86_glibc_rev
   toolchain_cpu = "x86"
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/i686-nacl-"
+  toolprefix =
+      rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/i686-nacl-",
+                  root_build_dir)
   is_clang = false
   is_nacl_glibc = true
 
@@ -62,7 +64,9 @@ nacl_toolchain("glibc_x64") {
   toolchain_package = "nacl_x86_glibc"
   toolchain_revision = nacl_x86_glibc_rev
   toolchain_cpu = "x64"
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/x86_64-nacl-"
+  toolprefix =
+      rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/x86_64-nacl-",
+                  root_build_dir)
   is_clang = false
   is_nacl_glibc = true
 
@@ -78,8 +82,9 @@ template("nacl_clang_toolchain") {
 
   toolchain_package = "pnacl_newlib"
   toolchain_revision = pnacl_newlib_rev
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/" +
-               invoker.toolchain_tuple + "-"
+  toolprefix = rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/" +
+                               invoker.toolchain_tuple + "-",
+                           root_build_dir)
 
   nacl_toolchain("clang_newlib_" + toolchain_cpu) {
     is_clang = true
@@ -96,8 +101,9 @@ template("nacl_irt_toolchain") {
 
   toolchain_package = "pnacl_newlib"
   toolchain_revision = pnacl_newlib_rev
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/" +
-               invoker.toolchain_tuple + "-"
+  toolprefix = rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/" +
+                               invoker.toolchain_tuple + "-",
+                           root_build_dir)
 
   link_irt = rebase_path("//native_client/build/link_irt.py", root_build_dir)
 
@@ -115,6 +121,10 @@ template("nacl_irt_toolchain") {
     ar = toolprefix + "ar"
     readelf = toolprefix + "readelf"
 
+    # Always build the IRT with full debugging symbols, regardless of
+    # how Chromium itself is being built (or other NaCl executables).
+    symbol_level = 2
+
     # Some IRT implementations (notably, Chromium's) contain C++ code,
     # so we need to link w/ the C++ linker.
     ld = "${python_path} ${link_irt} --tls-edit=${tls_edit} --link-cmd=${cxx} --readelf-cmd=${readelf}"