diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-16 13:20:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-16 13:20:03 +0100 |
| commit | 89eebfea3003dda71c0e8be246d7e5f529e3436b (patch) | |
| tree | 49669fbc9206c99e61e94499c0065cfe35a12019 /chromium/tools | |
| parent | 1a5c76109b5840dc84815fcc91b27148e6df11cc (diff) | |
| download | android_frameworks_webview-89eebfea3003dda71c0e8be246d7e5f529e3436b.tar.gz android_frameworks_webview-89eebfea3003dda71c0e8be246d7e5f529e3436b.tar.bz2 android_frameworks_webview-89eebfea3003dda71c0e8be246d7e5f529e3436b.zip | |
Merge scripts: fix hook.
There's no 'src' directory in our checkout, so the hook wasn't found.
Fix it.
Change-Id: Ibc6b4ba1e6849bfd1bf67acc91fed75bdb06bc47
Diffstat (limited to 'chromium/tools')
| -rwxr-xr-x | chromium/tools/merge_from_chromium.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |