From 89eebfea3003dda71c0e8be246d7e5f529e3436b Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Mon, 16 Jun 2014 13:20:03 +0100 Subject: Merge scripts: fix hook. There's no 'src' directory in our checkout, so the hook wasn't found. Fix it. Change-Id: Ibc6b4ba1e6849bfd1bf67acc91fed75bdb06bc47 --- chromium/tools/merge_from_chromium.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chromium/tools') diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py index 39727c9..740a636 100755 --- a/chromium/tools/merge_from_chromium.py +++ b/chromium/tools/merge_from_chromium.py @@ -257,7 +257,7 @@ def _GenerateMakefiles(version, unattended): # TODO(torne): come up with a way to deal with hooks from DEPS properly # Run libaddressinput hook as we need this to build. merge_common.GetCommandStdout(['python', - 'src/third_party/libaddressinput/chromium/tools/update-strings.py']) + 'third_party/libaddressinput/chromium/tools/update-strings.py']) # TODO(torne): The .tmp files are generated by # third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp into the source -- cgit v1.2.3