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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common_constants.gyp

Issue 17379019: Seperate NaCl switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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
« chrome/common/chrome_switches.cc ('K') | « chrome/common/nacl_switches.cc ('k') | chrome/nacl/nacl_broker_listener.cc » ('j') | chrome/nacl_common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common_constants.gyp
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index 7020f80e062e5bb7e9f6b908fa5b0de53f57527a..c6dd6e362156db3b9e45219a2c3e37af19207d52 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -82,6 +82,11 @@
['toolkit_uses_gtk == 1', {
'dependencies': ['../build/linux/system.gyp:gtk'],
}],
+ ['OS != "ios"', {
Mark Seaborn 2013/06/21 13:35:13 Why does this have 'OS != "ios"'? This isn't a us
+ 'dependencies': [
+ 'nacl_common.gypi:nacl_switches',
+ ],
+ }],
],
},
],
@@ -95,6 +100,7 @@
'<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc.
],
'dependencies': [
+ 'nacl_common.gypi:nacl_switches_win64',
'../base/base.gyp:base_nacl_win64',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
],
« chrome/common/chrome_switches.cc ('K') | « chrome/common/nacl_switches.cc ('k') | chrome/nacl/nacl_broker_listener.cc » ('j') | chrome/nacl_common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698