diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 00:01:08 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-22 00:01:08 +0000 |
| commit | 9e78ba23332c190da86ee478649d4c1bb1812e52 (patch) | |
| tree | 8ec16ff9159a2b27c63b944b26b7b47793c11356 /chrome/common_constants.gyp | |
| parent | 3a668152e094f68f62b34b44db6b0249691773b4 (diff) | |
| download | chromium_src-9e78ba23332c190da86ee478649d4c1bb1812e52.zip chromium_src-9e78ba23332c190da86ee478649d4c1bb1812e52.tar.gz chromium_src-9e78ba23332c190da86ee478649d4c1bb1812e52.tar.bz2 | |
Revert r207951 - "Separate NaCl switches to their own file."
This change doesn't build under xcode for some reason. See
http://build.chromium.org/p/chromium.webkit/builders/Mac%20Builder%20%28dbg%29/builds/28702
TBR=thakis@chromium.org, yael.aharon@intel.com
BUG=244791
Review URL: https://codereview.chromium.org/16867015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common_constants.gyp')
| -rw-r--r-- | chrome/common_constants.gyp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp index fefe2da..7020f80 100644 --- a/chrome/common_constants.gyp +++ b/chrome/common_constants.gyp @@ -82,11 +82,6 @@ ['toolkit_uses_gtk == 1', { 'dependencies': ['../build/linux/system.gyp:gtk'], }], - ['OS != "ios"', { - 'dependencies': [ - '../components/nacl_common.gypi:nacl_switches', - ], - }], ], }, ], @@ -101,7 +96,6 @@ ], 'dependencies': [ '../base/base.gyp:base_nacl_win64', - '../components/nacl_common.gypi:nacl_switches_win64', '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', ], 'defines': [ |