diff options
| author | mcgrathr <mcgrathr@chromium.org> | 2016-01-20 11:51:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-20 19:53:58 +0000 |
| commit | 0c27b8c9f8bf91cf8951084e5edb37ed520a2ca3 (patch) | |
| tree | eea3ef177024dc5a5bf8c29dc3626795ee334d4e /remoting | |
| parent | 7fb9d70481852fcaf711498d3975ef2df15b4256 (diff) | |
| download | chromium_src-0c27b8c9f8bf91cf8951084e5edb37ed520a2ca3.zip chromium_src-0c27b8c9f8bf91cf8951084e5edb37ed520a2ca3.tar.gz chromium_src-0c27b8c9f8bf91cf8951084e5edb37ed520a2ca3.tar.bz2 | |
GN: Drop enable_pnacl and enable_nacl_untrusted variables
Now that GN build rules for NaCl stuff are getting mature,
there is no need for these separate switches. Just using
enable_nacl alone keeps things simpler.
BUG=none
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/1568733002
Cr-Commit-Position: refs/heads/master@{#370446}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/BUILD.gn | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/BUILD.gn | 2 | ||||
| -rw-r--r-- | remoting/tools/javascript_key_tester/BUILD.gn | 2 | ||||
| -rw-r--r-- | remoting/webapp/build_template.gni | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index 155af30..c6360cd 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -70,7 +70,7 @@ group("remoting_all") { } } - if (enable_pnacl) { + if (enable_nacl) { deps += [ "//remoting/tools/javascript_key_tester" ] } } diff --git a/remoting/client/plugin/BUILD.gn b/remoting/client/plugin/BUILD.gn index 01432fd..109a859 100644 --- a/remoting/client/plugin/BUILD.gn +++ b/remoting/client/plugin/BUILD.gn @@ -42,7 +42,7 @@ executable("remoting_client_plugin_newlib") { include_dirs = [ "//ppapi/lib/gl/include" ] } -if (enable_pnacl && is_debug) { +if (enable_nacl && is_debug) { copy("remoting_client_plugin_newlib_debug") { public_deps = [ ":remoting_client_plugin_newlib", diff --git a/remoting/tools/javascript_key_tester/BUILD.gn b/remoting/tools/javascript_key_tester/BUILD.gn index 7f6cc31..3fea768 100644 --- a/remoting/tools/javascript_key_tester/BUILD.gn +++ b/remoting/tools/javascript_key_tester/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") -if (enable_pnacl) { +if (enable_nacl) { group("javascript_key_tester") { deps = [ ":javascript_key_tester_copies", diff --git a/remoting/webapp/build_template.gni b/remoting/webapp/build_template.gni index ab5d116..7f797f4 100644 --- a/remoting/webapp/build_template.gni +++ b/remoting/webapp/build_template.gni @@ -196,7 +196,7 @@ template("desktop_remoting_webapp") { "$target_gen_dir/credits.html", ] - if (enable_pnacl) { + if (enable_nacl) { 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") @@ -227,7 +227,7 @@ template("desktop_remoting_webapp") { "//remoting/webapp:credits", ] - if (enable_pnacl) { + if (enable_nacl) { deps += [ "${pexe_label}($pnacl_tc)" ] if (is_debug) { deps += [ "${pexe_label}_debug($pnacl_tc)" ] |