android_webview/tools/apk_merger.py - Issue 1877413004: Revert "Ignore WebViewPlatformBridge apk when merging apks"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/tools/apk_merger.py

Issue 1877413004: Revert "Ignore WebViewPlatformBridge apk when merging apks" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: android_webview/tools/apk_merger.py

diff --git a/android_webview/tools/apk_merger.py b/android_webview/tools/apk_merger.py

index 55f49515a0218f6517f01a5e605dc9d15b99fabe..4579285218b757672bab7504b9a3327db4d33a74 100755

--- a/android_webview/tools/apk_merger.py

+++ b/android_webview/tools/apk_merger.py

@@ -201,11 +201,10 @@ def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):

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', 'WebViewPlatformBridge.apk'])

+ ignore=['META-INF', 'AndroidManifest.xml'])

diff_files = GetDiffFiles(dcmp, tmp_dir_32)

« no previous file with comments | « no previous file | no next file » | no next file with comments »