diff options
| author | Bo Liu <boliu@google.com> | 2014-08-13 09:54:22 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-08-14 16:03:22 +0000 |
| commit | 462a80eeb54228445a3601b6aef6a3484cbf2615 (patch) | |
| tree | e2d4f055d99168ad5ece73e6c7d86d68dd326b11 /chromium/tools | |
| parent | 7b7d30a245af5508acc1169699e4f7ab05af13b9 (diff) | |
| download | android_frameworks_webview-462a80eeb54228445a3601b6aef6a3484cbf2615.tar.gz android_frameworks_webview-462a80eeb54228445a3601b6aef6a3484cbf2615.tar.bz2 android_frameworks_webview-462a80eeb54228445a3601b6aef6a3484cbf2615.zip | |
Fix merge_from_chromium.py script to work with new buildspec repo
New repo at
https://chrome-internal.googlesource.com/chrome/tools/buildspec
The updated script will work with 37.0.2062.70 in the 37.0.2062 branch.
Change-Id: I298f66e15bbf98ea9d83fc7e4b67efb9b19e0d4c
(cherry picked from commit 37b38e94b68b98cc79e412f53e38efe69bfaca27)
Diffstat (limited to 'chromium/tools')
| -rwxr-xr-x | chromium/tools/merge_from_chromium.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index 752b6ad..6a7a67c 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -157,8 +157,10 @@ def _MergeProjects(version, root_sha1, target, unattended, buildspec_url): if root_sha1: deps_content = _ReadGitFile(root_sha1, '.DEPS.git') else: - deps_content = _ReadGitFile('FETCH_HEAD', version + '/DEPS', - buildspec_url, 'master') + deps_content = _ReadGitFile('FETCH_HEAD', + 'releases/' + version + '/.DEPS.git', + buildspec_url, + 'master') deps_vars = _ParseDEPS(deps_content) |