From c673dbdbfa853ed101dfc9193a34c14b5134cc78 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Thu, 5 Dec 2013 16:09:32 +0000 Subject: automerger: download gn before generating makefiles. The gyp process now needs to run gn to generate some of the gyp files as part of the gyp->gn transition. Normally this is downloaded by runhooks, but we don't run hooks during the merge. Just copy the download command from DEPS for now. Change-Id: Ide64ccd156b6eb5a0dee6c8732a7ab7ab88dea50 --- chromium/tools/merge_from_chromium.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'chromium/tools') 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 -- cgit v1.2.3