diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | build/download_nacl_toolchains.py | 16 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 4 |
3 files changed, 16 insertions, 6 deletions
@@ -7,7 +7,7 @@ vars = { "webkit_revision": "93861", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "6539", + "nacl_revision": "6562", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. # TODO(brettw) We should use the "From" syntax to avoid hardcoding the diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py index c096b5e..4cb8b46 100755 --- a/build/download_nacl_toolchains.py +++ b/build/download_nacl_toolchains.py @@ -9,7 +9,17 @@ import os import sys -def Main(): +def Main(args): + # Handle chromeos=1 specially (until its building its own toolchain). + if 'chromeos=1' in os.environ.get('GYP_DEFINES', ''): + args = [ + '--nacl-newlib-only', + '--file-hash', 'linux_x86_newlib', + '8337d5ec327d857a49b500723ec9b792f4973abc', + '--base-url', ('https://commondatastorage.googleapis.com/' + 'nativeclient-archive2/special_chromeos'), + '--x86-version', '6561', + ] script_dir = os.path.dirname(os.path.abspath(__file__)) src_dir = os.path.dirname(script_dir) nacl_dir = os.path.join(src_dir, 'native_client') @@ -22,8 +32,8 @@ def Main(): sys.exit(0) sys.path.insert(0, nacl_build_dir) import download_toolchains - download_toolchains.Main() + download_toolchains.Main(args) if __name__ == '__main__': - Main() + Main(sys.argv[1:]) diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index a6d6375..abfab38 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -104,7 +104,7 @@ }, ], }], - ['OS!="win" and target_arch=="ia32" and chromeos==0', { + ['OS!="win" and target_arch=="ia32"', { # Linux-x86-32 and OSX need only the x86-32 IRT. 'actions': [ { @@ -120,7 +120,7 @@ }, ], }], - ['OS!="win" and target_arch=="x64" and chromeos==0', { + ['OS!="win" and target_arch=="x64"', { # Linux-x86-64 needs only the x86-64 IRT. 'actions': [ { |