diff options
| author | sgurun <sgurun@chromium.org> | 2016-01-22 15:29:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-22 23:31:27 +0000 |
| commit | fd17f011bbafa4e6e5e98e616a1cbf1a6580f968 (patch) | |
| tree | 5fe5f9f63d16548e5b066cb077fb7f482a543a90 /android_webview/tools | |
| parent | eccc4bd0953d74e230155fda21199a8bc46b660a (diff) | |
| download | chromium_src-fd17f011bbafa4e6e5e98e616a1cbf1a6580f968.zip chromium_src-fd17f011bbafa4e6e5e98e616a1cbf1a6580f968.tar.gz chromium_src-fd17f011bbafa4e6e5e98e616a1cbf1a6580f968.tar.bz2 | |
Ignore WebViewPlatformBridge apk when merging apks
BUG=546822
The apk is failing comparison because of timestamps not content difference,
so ignore it for now.
Review URL: https://codereview.chromium.org/1624693003
Cr-Commit-Position: refs/heads/master@{#371077}
Diffstat (limited to 'android_webview/tools')
| -rwxr-xr-x | android_webview/tools/apk_merger.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/tools/apk_merger.py b/android_webview/tools/apk_merger.py index c9727d9..e9ea1fe 100755 --- a/android_webview/tools/apk_merger.py +++ b/android_webview/tools/apk_merger.py @@ -173,10 +173,11 @@ def main(): UnpackApk(args.apk_64bit, tmp_dir_64) UnpackApk(args.apk_32bit, tmp_dir_32) + # TODO(sgurun) remove WebViewPlatformBridge.apk from this list crbug/580678 dcmp = filecmp.dircmp( tmp_dir_64, tmp_dir_32, - ignore=['META-INF', 'AndroidManifest.xml']) + ignore=['META-INF', 'AndroidManifest.xml', 'WebViewPlatformBridge.apk']) diff_files = GetDiffFiles(dcmp, tmp_dir_32) |