summaryrefslogtreecommitdiffstats
path: root/chromium/tools
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-06-19 10:45:41 +0100
committerTorne (Richard Coles) <torne@google.com>2014-06-19 10:45:41 +0100
commit2abf9f022d36e29c63c6d0f529449de85596fc48 (patch)
tree2ba9b84a530e60bd7117c2819f9c8c1628c9229d /chromium/tools
parent34a8ec305a085807c44670e4e912f5e5e08b5f4d (diff)
downloadandroid_frameworks_webview-2abf9f022d36e29c63c6d0f529449de85596fc48.tar.gz
android_frameworks_webview-2abf9f022d36e29c63c6d0f529449de85596fc48.tar.bz2
android_frameworks_webview-2abf9f022d36e29c63c6d0f529449de85596fc48.zip
Remove libaddressinput hook.
This hook has been deleted upstream and isn't needed any more. Change-Id: Ide487739c6111ff38b09353781097b4c315dc162
Diffstat (limited to 'chromium/tools')
-rwxr-xr-xchromium/tools/merge_from_chromium.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/chromium/tools/merge_from_chromium.py b/chromium/tools/merge_from_chromium.py
index 740a636..752b6ad 100755
--- a/chromium/tools/merge_from_chromium.py
+++ b/chromium/tools/merge_from_chromium.py
@@ -255,9 +255,6 @@ def _GenerateMakefiles(version, unattended):
logging.debug('Generating makefiles ...')
# 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',
- '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