GN: Strip NaCl IRT and save its .debug file

ppapi/BUILD.gn

 # 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.
 
 copy("copy_test_files") {
   visibility = [ ":*" ]
   sources = [
     # Keep "test_case.html.mock-http-headers" with "test_case.html".
     "tests/ppapi_nacl_tests_newlib.nmf",
     "tests/test_case.html",
@@ skipping 200 matching lines @@
       } else {
         deps += [ ":ppapi_cpp_lib" ]
       }
     }
 
     if (current_cpu == "pnacl") {
       action("translate_pexe_to_nexe") {
         pexe = "${root_out_dir}/ppapi_nacl_tests.pexe"
         nexe = "${root_out_dir}/ppapi_nacl_tests.nexe"
 
-        script = "${nacl_toolchain_dir}/pnacl_newlib/bin/pydir/loader.py"
+        script = "${nacl_toolchain_bindir}/pydir/loader.py"
         sources = [
           pexe,
         ]
         outputs = [
           nexe,
         ]
 
         # TODO(phosek): remove the following once change 1360243003 is rolled
         # into Chrome and use $target_cpu directly.
         if (target_cpu == "x86") {
@@ skipping 59 matching lines @@
         ]
       } else {
         deps = [
           ":ppapi_nacl_tests",
         ]
       }
     }
 
     action("generate_nmf") {
       if (is_nacl_glibc) {
-        if (current_cpu == "arm") {
-          toolchain_dir = "${nacl_toolchain_dir}/nacl_arm_glibc"
-        } else {
-          toolchain_dir = "${nacl_toolchain_dir}/nacl_x86_glibc"
-        }
         nmf = "${root_build_dir}/ppapi_nacl_tests_glibc.nmf"
       } else if (current_cpu == "pnacl") {
-        toolchain_dir = "${nacl_toolchain_dir}/pnacl_newlib"
         nmf = "${root_build_dir}/ppapi_nacl_tests_pnacl.nmf"
       } else {
-        toolchain_dir = "${nacl_toolchain_dir}/nacl_x86_newlib"
         nmf = "${root_build_dir}/ppapi_nacl_tests_newlib.nmf"
       }
       nexe = "${root_out_dir}/ppapi_nacl_tests.nexe"
 
-      if (current_cpu == "arm") {
-        objdump = rebase_path("${toolchain_dir}/bin/arm-nacl-objdump")
-      } else {
-        objdump = rebase_path("${toolchain_dir}/bin/x86_64-nacl-objdump")
-      }
+      objdump = rebase_path("${nacl_toolprefix}objdump")
 
       script = "//native_client_sdk/src/tools/create_nmf.py"
       sources = [
         nexe,
       ]
       outputs = [
         nmf,
       ]
       data = [
         nexe,
       ]
       nmf_flags = []
       if (is_nacl_glibc) {
         nmf_flags += [ "--library-path=" + rebase_path(root_out_dir) ]
         if (current_cpu == "x86") {
           nmf_flags += [ "--library-path=" +
-                         rebase_path("${toolchain_dir}/x86_64-nacl/lib32") ]
+                         rebase_path("${nacl_toolchain_tooldir}/lib32") ]
           data += [ "$root_build_dir/lib32/" ]
         }
         if (target_cpu == "x64" || (target_cpu == "x86" && is_win)) {
           nmf_flags += [ "--library-path=" +
-                         rebase_path("${toolchain_dir}/x86_64-nacl/lib") ]
+                         rebase_path("${nacl_toolchain_tooldir}/lib") ]
           data += [ "$root_build_dir/lib64/" ]
         }
         if (current_cpu == "arm") {
           nmf_flags += [ "--library-path=" +
-                         rebase_path("${toolchain_dir}/arm-nacl/lib") ]
+                         rebase_path("${nacl_toolchain_tooldir}/lib") ]
           data += [ "$root_build_dir/lib/" ]
         }
       }
       args = [
                "--no-default-libpath",
                "--objdump=" + objdump,
                "--output=" + rebase_path(nmf, root_build_dir),
                "--stage-dependencies=" + rebase_path(root_build_dir),
              ] + nmf_flags + rebase_path(sources, root_build_dir)
       if (current_cpu == "pnacl") {
@@ skipping 13 matching lines @@
 
   group("ppapi_nacl_tests_all") {
     data_deps = [
       ":copy_test_files",
       ":nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})",
       ":generate_nmf(//build/toolchain/nacl:glibc_${target_cpu})",
       ":generate_nmf(//build/toolchain/nacl:newlib_pnacl)",
     ]
   }
 }