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

Unified Diff: tools/export_tarball/export_tarball.py

Issue 7701026: Revert 97987 - Switching NaCl IRT to be built inside the chrome build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/nacl.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/export_tarball/export_tarball.py
===================================================================
--- tools/export_tarball/export_tarball.py (revision 98029)
+++ tools/export_tarball/export_tarball.py (working copy)
@@ -98,6 +98,17 @@
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])
« no previous file with comments | « chrome/nacl.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698