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

Unified Diff: build/config/features.gni

Issue 1417823006: Build NaCl in the CrOS GN builds and make sure "all" works (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and make sure "all" works also (fix remoting) 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 | « no previous file | ppapi/native_client/src/untrusted/pnacl_support_extension/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 d8ddb4743ab76fad43f55935eb525c5ecf8d4fc0..0a333cfa8ebc733b8f40a199821756a90b2252f6 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -39,8 +39,8 @@ declare_args() {
# the commented out logic.
# Eventually we want this to be:
# enable_nacl = !is_ios && !is_android && !is_chromecast
- enable_nacl = (is_mac || (is_linux && !is_chromeos) || is_nacl) &&
- current_cpu != "mipsel" && !is_chromecast
+ enable_nacl = (is_linux || is_mac || is_nacl) && current_cpu != "mipsel" &&
+ !is_chromecast
enable_nacl_untrusted = enable_nacl
enable_pnacl = enable_nacl_untrusted
« no previous file with comments | « no previous file | ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698