Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1304)

Unified Diff: android_webview/tools/apk_merger.py

Issue 2629663003: Reland of Android: Delete rezip in favor of zipalign -p (Closed)
Patch Set: no gdbserver Created 3 years, 11 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
« no previous file with comments | « BUILD.gn ('k') | build/android/gyp/apkbuilder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/tools/apk_merger.py
diff --git a/android_webview/tools/apk_merger.py b/android_webview/tools/apk_merger.py
index 74eac37ca37314e71274512b4e057a460c816299..e3a766b2c93de888e06b9835d9e23c1ce7ee04ed 100755
--- a/android_webview/tools/apk_merger.py
+++ b/android_webview/tools/apk_merger.py
@@ -135,8 +135,7 @@ def AddDiffFiles(diff_files, tmp_dir_32, out_zip, expected_files,
def SignAndAlignApk(tmp_apk, signed_tmp_apk, new_apk, zipalign_path,
- keystore_path, key_name, key_password,
- page_align_shared_libraries):
+ keystore_path, key_name, key_password):
try:
finalize_apk.JarSigner(
keystore_path,
@@ -149,7 +148,6 @@ def SignAndAlignApk(tmp_apk, signed_tmp_apk, new_apk, zipalign_path,
try:
finalize_apk.AlignApk(zipalign_path,
- page_align_shared_libraries,
signed_tmp_apk,
new_apk)
except build_utils.CalledProcessError as e:
@@ -179,8 +177,6 @@ def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):
expected_files = {'snapshot_blob_32.bin': False}
if args.shared_library:
expected_files[args.shared_library] = not args.uncompress_shared_libraries
- if args.debug:
- expected_files['gdbserver'] = True
# need to unpack APKs to compare their contents
UnpackApk(args.apk_64bit, tmp_dir_64)
@@ -224,7 +220,8 @@ def main():
parser.add_argument('--key_name', required=True)
parser.add_argument('--key_password', required=True)
parser.add_argument('--shared_library')
- parser.add_argument('--page-align-shared-libraries', action='store_true')
+ parser.add_argument('--page-align-shared-libraries', action='store_true',
+ help='Obsolete, but remains for backwards compatibility')
parser.add_argument('--uncompress-shared-libraries', action='store_true')
parser.add_argument('--debug', action='store_true')
# This option shall only used in debug build, see http://crbug.com/631494.
@@ -250,8 +247,7 @@ def main():
MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64)
SignAndAlignApk(tmp_apk, signed_tmp_apk, new_apk, args.zipalign_path,
- args.keystore_path, args.key_name, args.key_password,
- args.page_align_shared_libraries)
+ args.keystore_path, args.key_name, args.key_password)
except ApkMergeFailure as e:
print e
« no previous file with comments | « BUILD.gn ('k') | build/android/gyp/apkbuilder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698