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

Unified Diff: chrome/chrome.gyp

Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)
Patch Set: Created 11 years, 3 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 | « chrome/browser/plugin_service.cc ('k') | chrome/renderer/render_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 1ac712db7b2fe6bc260067720d29101f34dd3258..d7a79e7ac924bd9fba9647b0e151cf1dd6b64ba7 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2998,7 +2998,6 @@
'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D',
'dependencies': [
'common',
- 'nacl',
'plugin',
'chrome_resources',
'chrome_strings',
@@ -3114,6 +3113,11 @@
],
},
'conditions': [
+ ['disable_nacl!=1', {
+ 'dependencies': [
+ 'nacl',
+ ],
+ }],
# Linux-specific rules.
['OS=="linux"', {
'dependencies': [
« no previous file with comments | « chrome/browser/plugin_service.cc ('k') | chrome/renderer/render_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698