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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 299703016: Gate disabling nacl code on proper gyp flags, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix guard on flags code Created 6 years, 7 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/build_config.h ('k') | build/filename_rules.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 369d838b52d403dfc895cdbae5633c6fd329948f..ae040995acefa71853fad744c5016d53b2090a59 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -980,6 +980,8 @@
'google_api_key%': '',
'google_default_client_id%': '',
'google_default_client_secret%': '',
+ # Native Client is enabled by default.
+ 'disable_nacl%': '0',
},
# Copy conditionally-set variables out one scope.
@@ -1345,8 +1347,8 @@
# Disable Dart by default.
'enable_dart%': 0,
- # Native Client is enabled by default.
- 'disable_nacl%': 0,
+ # Copy out the setting of disable_nacl.
+ 'disable_nacl%': '<(disable_nacl)',
# Portable Native Client is enabled by default.
'disable_pnacl%': 0,
« no previous file with comments | « build/build_config.h ('k') | build/filename_rules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698