diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 19:00:31 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-02 19:00:31 +0000 |
| commit | d8c7cbccd6557ed455d9d4a212a2824972072505 (patch) | |
| tree | ff9261a8931be3775c6c3786c4527a30cf6b5676 /chrome/chrome.gyp | |
| parent | 21e8556f0651a4e132fde29bc4738229eaa3305b (diff) | |
| download | chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.zip chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.gz chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.bz2 | |
Add an option to disable NaCl at compile time for platforms where it doesn't build yet
Just add disable_nacl=1 to gyp defines
Review URL: http://codereview.chromium.org/257029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index ab2faf1..7a20754 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2999,7 +2999,6 @@ 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D', 'dependencies': [ 'common', - 'nacl', 'plugin', 'chrome_resources', 'chrome_strings', @@ -3115,6 +3114,11 @@ ], }, 'conditions': [ + ['disable_nacl!=1', { + 'dependencies': [ + 'nacl', + ], + }], # Linux-specific rules. ['OS=="linux"', { 'dependencies': [ |