diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 23:51:25 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 23:51:25 +0000 |
| commit | c532ba7b52bed035470d1e9eb1ec17861b887d68 (patch) | |
| tree | 2c33844fb4025c60a8e25eedb03312868da962a0 /tools/export_tarball | |
| parent | 5d5cc65756ad8f193205a8a03ae1e8225733a8ce (diff) | |
| download | chromium_src-c532ba7b52bed035470d1e9eb1ec17861b887d68.zip chromium_src-c532ba7b52bed035470d1e9eb1ec17861b887d68.tar.gz chromium_src-c532ba7b52bed035470d1e9eb1ec17861b887d68.tar.bz2 | |
Revert 97943 - Switching NaCl IRT to be built inside the chrome build.
Third 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
R=noelallen@google.com
BUG=http://code.google.com/p/chromium/issues/detail?id=93520
TEST=None
Review URL: http://codereview.chromium.org/7685042
TBR=bradnelson@google.com
Review URL: http://codereview.chromium.org/7718016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/export_tarball')
| -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]) |