Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: remoting/webapp/build_template.gni

Issue 1432603003: GN: Avoid nontrivial shell commands in gcc_toolchain tool("link") (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn set-but-unused nit Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/build_template.gni
diff --git a/remoting/webapp/build_template.gni b/remoting/webapp/build_template.gni
index 3b8d9509f2ccb89951fc5f2f8caa3114315cec46..370a1436ac30044234f37210dd86fba52a167fe2 100644
--- a/remoting/webapp/build_template.gni
+++ b/remoting/webapp/build_template.gni
@@ -197,9 +197,9 @@ template("desktop_remoting_webapp") {
]
if (enable_pnacl) {
- pexe_dir = get_label_info(
- "//remoting/client/plugin:remoting_client_plugin_newlib(//build/toolchain/nacl:newlib_pnacl)",
- "root_out_dir")
+ pnacl_tc = "//build/toolchain/nacl:newlib_pnacl"
+ pexe_label = "//remoting/client/plugin:remoting_client_plugin_newlib"
+ pexe_dir = get_label_info("${pexe_label}($pnacl_tc)", "root_out_dir")
extra_files += [ "$pexe_dir/remoting_client_plugin_newlib.pexe" ]
if (is_debug) {
@@ -228,7 +228,10 @@ template("desktop_remoting_webapp") {
]
if (enable_pnacl) {
- deps += [ "//remoting/client/plugin:remoting_client_plugin_newlib(//build/toolchain/nacl:newlib_pnacl)" ]
+ deps += [ "${pexe_label}($pnacl_tc)" ]
+ if (is_debug) {
+ deps += [ "${pexe_label}_debug($pnacl_tc)" ]
+ }
}
# Create a file that contains a list of all the resource files needed
« no previous file with comments | « remoting/client/plugin/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698