diff options
| author | Richard Coles <torne@google.com> | 2013-12-11 12:08:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-11 12:08:39 +0000 |
| commit | 3aa5f079750def82cafa2e8b18f790e4b869b725 (patch) | |
| tree | 3eb9e083d779bc6bcdc2568c3e53476f9e254682 | |
| parent | 3fbc9545f7fda99adedd2216becd106d6b0c9ccf (diff) | |
| parent | 36797b2162e38e606e48ac5cabec6feae6f078d1 (diff) | |
| download | android_frameworks_webview-3aa5f079750def82cafa2e8b18f790e4b869b725.tar.gz android_frameworks_webview-3aa5f079750def82cafa2e8b18f790e4b869b725.tar.bz2 android_frameworks_webview-3aa5f079750def82cafa2e8b18f790e4b869b725.zip | |
Merge "Revert "automerger: download gn before generating makefiles."" into master-chromium
| -rwxr-xr-x | chromium/tools/merge_from_chromium.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index a2cdb04..170250a 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -259,17 +259,6 @@ 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 |