diff options
author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 00:32:50 +0000 |
---|---|---|
committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 00:32:50 +0000 |
commit | b4e6d2db0de191126e1542bc2db2ec292d68462c (patch) | |
tree | 1bf3fe68e7f2233963ee7b53b3b5043e58db3bf4 /build | |
parent | fcb75713167098993b8c3de22b1e388877770e7c (diff) | |
download | chromium_src-b4e6d2db0de191126e1542bc2db2ec292d68462c.zip chromium_src-b4e6d2db0de191126e1542bc2db2ec292d68462c.tar.gz chromium_src-b4e6d2db0de191126e1542bc2db2ec292d68462c.tar.bz2 |
NaCl: Pull in NaCl's integrated runtime (IRT) library via DEPS
This hooks up the download script that I added in an earlier commit.
This also tweaks download_nacl_irt.py to add a "nacl_" prefix to the
downloaded files. This is in preparation for when the files are added
to a Gyp 'copies' rule, since these Gyp rules are not able to rename
files. We want to make the files' purpose clear when they are copied
into an install directory along with non-NaCl-related files.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595
TEST=run "gclient runhooks" in various situations:
1) IRT binaries not present: files should get downloaded
2) IRT binaries present: re-use existing downloaded files
3) nacl_revision changed: re-download, and give error about hashes
Review URL: http://codereview.chromium.org/6893080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/download_nacl_irt.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/download_nacl_irt.py b/build/download_nacl_irt.py index 35bcb9a..0f6ead4 100644 --- a/build/download_nacl_irt.py +++ b/build/download_nacl_irt.py @@ -163,7 +163,7 @@ def Main(): dest_dir = os.path.join(nacl_dir, 'irt_binaries') if not os.path.exists(dest_dir): os.makedirs(dest_dir) - dest_path = os.path.join(dest_dir, 'irt_%s.nexe' % arch) + dest_path = os.path.join(dest_dir, 'nacl_irt_%s.nexe' % arch) DownloadFileWithRetry(dest_path, url) downloaded_hash = HashFile(dest_path) if downloaded_hash != expected_hash: |