diff options
| author | Richard Coles <torne@google.com> | 2013-12-18 11:00:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-18 11:00:34 +0000 |
| commit | 6944a8d902d36b30fd75c6562f0c73da34617648 (patch) | |
| tree | 15dca64697082c57162234faef99d7d65c08a39b /chromium/tools | |
| parent | d40d8d933e977971e271e70d1c625dad76c12d6b (diff) | |
| parent | d7fe98f16c652eb648ff5668a2d81858458c18f6 (diff) | |
| download | android_frameworks_webview-6944a8d902d36b30fd75c6562f0c73da34617648.tar.gz android_frameworks_webview-6944a8d902d36b30fd75c6562f0c73da34617648.tar.bz2 android_frameworks_webview-6944a8d902d36b30fd75c6562f0c73da34617648.zip | |
Merge "Reland "automerger: download gn before generating makefiles."" into master-chromium
Diffstat (limited to 'chromium/tools')
| -rwxr-xr-x | chromium/tools/merge_from_chromium.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index 170250a..a2cdb04 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -259,6 +259,17 @@ def _GenerateMakefiles(version, unattended): """ logging.debug('Generating makefiles ...') + # TODO(torne): come up with a way to deal with hooks from DEPS properly + # Download linux GN from google storage as per hook in DEPS. + merge_common.GetCommandStdout(['download_from_google_storage', + '--no_resume', + '--platform=linux*', + '--no_auth', + '--bucket', + 'chromium-gn', + '-s', + 'tools/gn/bin/linux/gn.sha1']) + # TODO(torne): The .tmp files are generated by # third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp into the source # tree. We should avoid this, or at least use a more specific name to avoid |