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

Unified Diff: build/config/features.gni

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet more feedback Created 5 years, 10 months 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 | « build/config/BUILDCONFIG.gn ('k') | chrome/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 5477674cc03313d1d6836b1f5ec549372a15dced..5ee92f77f667ab959555e4ab8958ce8a4649a915 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -22,9 +22,20 @@ declare_args() {
enable_plugins = !is_android && !is_ios
# Enables Native Client support.
- # TODO(GYP) enable this when nacl works in GN.
+ # TODO(GYP): Get NaCl linking on other platforms.
+ # Also, see if we can always get rid of enable_nacl_untrusted and
+ # enable_pnacl and always build them if enable_nacl is true.
+ # The "is_nacl" part of the condition is needed to ensure that
+ # the untrusted code is built properly; arguably it should be
+ # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but
+ # this will go away when Mac and Win are working and we can just use
+ # the commented out logic.
+ # enable_nacl = !is_ios && !is_android
+ # Currently this *should* work:
+ # enable_nacl = (is_linux && build_cpu_arch == "x64") || is_nacl
enable_nacl = false
- #enable_nacl = (!is_ios && !is_android)
+ enable_nacl_untrusted = enable_nacl
+ enable_pnacl = enable_nacl_untrusted
# If debug_devtools is set to true, JavaScript files for DevTools are stored
# as is and loaded from disk. Otherwise, a concatenated file is stored in
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | chrome/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698