Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: DEPS.nacl

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 import gclient_utils 1 import gclient_utils
2 import os 2 import os
3 3
4 path = gclient_utils.FindGclientRoot(os.getcwd()) 4 path = gclient_utils.FindGclientRoot(os.getcwd())
5 execfile(os.path.join(path, 'src', 'DEPS')) # Include proper Mojo DEPS. 5 execfile(os.path.join(path, 'src', 'DEPS')) # Include proper Mojo DEPS.
6 6
7 # Now we need to add in NaCl. 7 # Now we need to add in NaCl.
8 8
9 vars.update({ 9 vars.update({
10 'nacl_revision': '62b6f76d587ef1f7e9231815fd31fef0a1dca6ff', 10 'nacl_revision': '19f11aa481261f38f2a1e9a04e41a7e12aa70e32',
11 }) 11 })
12 12
13 deps.update({ 13 deps.update({
14 'src/native_client': 14 'src/native_client':
15 Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('na cl_revision'), 15 Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('na cl_revision'),
16 }) 16 })
17 17
18 hooks.append({ 18 hooks.append({
19 # This downloads binaries for Native Client's newlib toolchain. 19 # This downloads binaries for Native Client's newlib toolchain.
20 # Done in lieu of building the toolchain from scratch as it can take 20 # Done in lieu of building the toolchain from scratch as it can take
21 # anywhere from 30 minutes to 4 hours depending on platform to build. 21 # anywhere from 30 minutes to 4 hours depending on platform to build.
22 'name': 'nacltools', 22 'name': 'nacltools',
23 'pattern': '.', 23 'pattern': '.',
24 'action': [ 24 'action': [
25 'python', 'src/build/download_nacl_toolchains.py', 25 'python', 'src/build/download_nacl_toolchains.py',
26 '--packages', 'pnacl_newlib', 26 '--packages', 'pnacl_newlib',
27 'sync', '--extract', 27 'sync', '--extract',
28 ], 28 ],
29 }) 29 })
OLDNEW
« no previous file with comments | « DEPS ('k') | base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698