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 /ppapi | |
| 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 'ppapi')
| -rw-r--r-- | ppapi/BUILD.gn | 8 | ||||
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn index 2ac6214..8ad22ab 100644 --- a/ppapi/BUILD.gn +++ b/ppapi/BUILD.gn @@ -369,12 +369,8 @@ if (enable_nacl) { ":copy_test_files", ":ppapi_nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})", ":ppapi_nacl_tests(//build/toolchain/nacl:glibc_${target_cpu})", + ":ppapi_nacl_tests(//build/toolchain/nacl:newlib_pnacl)", + ":ppapi_nacl_tests(//build/toolchain/nacl:newlib_pnacl_nonsfi)", ] - if (enable_pnacl) { - data_deps += [ - ":ppapi_nacl_tests(//build/toolchain/nacl:newlib_pnacl)", - ":ppapi_nacl_tests(//build/toolchain/nacl:newlib_pnacl_nonsfi)", - ] - } } } diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn index dfe412e..c8cd12d 100644 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") -if (enable_nacl && enable_nacl_untrusted && enable_pnacl) { +if (enable_nacl) { # This target copies files from the prebuilt/DEPS'ed in pnacl_translator # toolchain and copies the latest PNaCl IRT shim library. # We could use 'copies', but we want to rename the files in a white-listed |