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

Unified Diff: android_webview/tools/apk_merger.py

Issue 2595233003: Revert of Android: Delete rezip in favor of zipalign -p (Closed)
Patch Set: Created 4 years 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 713a58de883907f14c69d2adb9f584c93d8830d8..74eac37ca37314e71274512b4e057a460c816299 100755
--- a/android_webview/tools/apk_merger.py
+++ b/android_webview/tools/apk_merger.py
@@ -135,7 +135,8 @@
def SignAndAlignApk(tmp_apk, signed_tmp_apk, new_apk, zipalign_path,
- keystore_path, key_name, key_password):
+ keystore_path, key_name, key_password,
+ page_align_shared_libraries):
try:
finalize_apk.JarSigner(
keystore_path,
@@ -148,6 +149,7 @@
try:
finalize_apk.AlignApk(zipalign_path,
+ page_align_shared_libraries,
signed_tmp_apk,
new_apk)
except build_utils.CalledProcessError as e:
@@ -222,8 +224,7 @@
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',
- help='Obsolete, but remains for backwards compatibility')
+ parser.add_argument('--page-align-shared-libraries', action='store_true')
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.
@@ -249,7 +250,8 @@
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.keystore_path, args.key_name, args.key_password,
+ args.page_align_shared_libraries)
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