Commit cd9aea06 authored by scottmg@chromium.org's avatar scottmg@chromium.org

Use toolchain hash that's in buildtools

Hash copied at https://codereview.chromium.org/449673003/.

R=iannucci@chromium.org
BUG=400830

Review URL: https://codereview.chromium.org/447183005

Cr-Commit-Position: refs/heads/master@{#288477}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288477 0039d316-1c4b-4281-b951-d872f2087c98
parent 3aca0d8c
...@@ -73,7 +73,7 @@ vars = { ...@@ -73,7 +73,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling build tools # the commit queue can handle CLs rolling build tools
# and whatever else without interference from each other. # and whatever else without interference from each other.
"buildtools_revision": "59b93247766e1cdac6e482637ad493df38f7aeb7", "buildtools_revision": "33f3e1c4e0d125641524c0a5955594b1c22c804a",
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling PDFIum # the commit queue can handle CLs rolling PDFIum
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
27eac9b2869ef6c89391f305a3f01285ea317867
9d9a93134b3eabd003b85b4e7dea06c0eae150ed
...@@ -129,7 +129,8 @@ def CopyVsRuntimeDlls(output_dir, runtime_dirs): ...@@ -129,7 +129,8 @@ def CopyVsRuntimeDlls(output_dir, runtime_dirs):
def _GetDesiredVsToolchainHashes(): def _GetDesiredVsToolchainHashes():
"""Load a list of SHA1s corresponding to the toolchains that we want installed """Load a list of SHA1s corresponding to the toolchains that we want installed
to build with.""" to build with."""
sha1path = os.path.join(script_dir, 'toolchain_vs2013.hash') sha1path = os.path.join(script_dir,
'..', 'buildtools', 'toolchain_vs2013.hash')
with open(sha1path, 'rb') as f: with open(sha1path, 'rb') as f:
return f.read().strip().splitlines() return f.read().strip().splitlines()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment