diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 13:03:43 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 13:03:43 +0000 |
| commit | f11b7f71dbe4346048c6f14d7c2aee0f5bc7435b (patch) | |
| tree | 837269215a36d7866204dcda392141e2897b4232 /tools | |
| parent | 360f84154d69bc200ed922ee3519faca33deed75 (diff) | |
| download | chromium_src-f11b7f71dbe4346048c6f14d7c2aee0f5bc7435b.zip chromium_src-f11b7f71dbe4346048c6f14d7c2aee0f5bc7435b.tar.gz chromium_src-f11b7f71dbe4346048c6f14d7c2aee0f5bc7435b.tar.bz2 | |
Revert 97987 - Switching NaCl IRT to be built inside the chrome build.
Fourth attempt:
Switching IRT to be built inside the chrome build. Dropping the IRT download
step from the DEPS. Step3 of a many step plan to switch where ppapi + irt
are built.
Dropping download_nacl_irt because we no longer rely on a prebuilt copy.
Dropping irt download drop source tarball (assume people using it will have
to download / build their own nacl toolchain).
Old Review URL: http://codereview.chromium.org/7669058
Review URL: http://codereview.chromium.org/7701017
TBR=bradnelson@google.com
Review URL: http://codereview.chromium.org/7701026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/export_tarball/export_tarball.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/export_tarball/export_tarball.py b/tools/export_tarball/export_tarball.py index 787182e..03c8995 100644 --- a/tools/export_tarball/export_tarball.py +++ b/tools/export_tarball/export_tarball.py @@ -98,6 +98,17 @@ def main(argv): print 'Cannot find the src directory.' return 1 + nacl_download_path = os.path.join( + GetSourceDirectory(), 'build', 'download_nacl_irt.py') + nacl_cwd = os.path.join(GetSourceDirectory(), '..') + if subprocess.call(['python', nacl_download_path], cwd=nacl_cwd) != 0: + # The error is not fatal - NaCl is still experimental. + print 'Failed to download NaCl integrated runtime files.' + print 'The NaCl-enabled build will fail. You can pass -Ddisable_nacl=1' + print 'to gyp as a workaround. For more info see' + print ('http://groups.google.com/a/chromium.org/group/chromium-dev/' + 'browse_thread/thread/1fe6e2c3f9e78c2b') + output_fullname = args[0] + '.tar.bz2' output_basename = os.path.basename(args[0]) |