diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-27 02:30:42 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-27 02:30:42 +0000 |
| commit | 4bad824d78ffae3be8ee4f9431e9c3f5ab5ea532 (patch) | |
| tree | 74b171c0fd553b6d26cc6363231b345616a5a8c5 /build | |
| parent | bbe4e5b4bd06f3b1340a81a0f0311c9c07959aa2 (diff) | |
| download | chromium_src-4bad824d78ffae3be8ee4f9431e9c3f5ab5ea532.zip chromium_src-4bad824d78ffae3be8ee4f9431e9c3f5ab5ea532.tar.gz chromium_src-4bad824d78ffae3be8ee4f9431e9c3f5ab5ea532.tar.bz2 | |
Disable build of NaCl in ChromeOS
Due to a hack which pins the ChromeOS toolchain in a python script,
attempts to roll deps past a toolchain bump is failing for ChomeOS.
This CL disables NaCl in ChromeOS until we can fix the build issue.
BUG= http://code.google.com/p/chromium/issues/detail?id=105484
TRB= bradnelson@chromium.org
Review URL: http://codereview.chromium.org/8710002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index e5f3af4..b3a4936 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -621,7 +621,7 @@ 'conditions': [ # Used to disable Native Client at compile time, for platforms where it # isn't supported (ARM) - ['target_arch=="arm"', { + ['target_arch=="arm" or chromeos==1', { 'disable_nacl%': 1, }, { 'disable_nacl%': 0, |