diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 03:21:41 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 03:21:41 +0000 |
| commit | 1db67469b54a6d44187e153b75c852151ebf22fb (patch) | |
| tree | 736ef56dd30aff3acbc62fdf5bc32f370ae89bd6 /build | |
| parent | b0848cdc75e6221550e01fbac4a4b2bb8071a79b (diff) | |
| download | chromium_src-1db67469b54a6d44187e153b75c852151ebf22fb.zip chromium_src-1db67469b54a6d44187e153b75c852151ebf22fb.tar.gz chromium_src-1db67469b54a6d44187e153b75c852151ebf22fb.tar.bz2 | |
Pulling in new nacl toolchain for chromeos.
BUG=http://code.google.com/p/chromium/issues/detail?id=105658
TEST=None
R=aa@chromium.org
TBR
Review URL: http://codereview.chromium.org/8728022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rwxr-xr-x | build/download_nacl_toolchains.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8b27923..6d53044 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -626,7 +626,7 @@ 'conditions': [ # Used to disable Native Client at compile time, for platforms where it # isn't supported (ARM) - ['target_arch=="arm" or chromeos==1', { + ['target_arch=="arm"', { 'disable_nacl%': 1, }, { 'disable_nacl%': 0, diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py index f988891..580f410 100755 --- a/build/download_nacl_toolchains.py +++ b/build/download_nacl_toolchains.py @@ -15,10 +15,10 @@ def Main(args): args = [ '--nacl-newlib-only', '--file-hash', 'linux_x86_newlib', - '8337d5ec327d857a49b500723ec9b792f4973abc', + '1deb316302fde89a2200dff6550cf510ae90b89b', '--base-url', ('https://commondatastorage.googleapis.com/' 'nativeclient-archive2/special_chromeos'), - '--x86-version', '6561', + '--x86-version', '7258', ] print 'NOTE: Special handling for chromeos' print 'Running with these argument instead:' |