Revert of Android: Delete rezip in favor of zipalign -p

android_webview/tools/apk_merger.py

 #!/usr/bin/python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Merges a 64-bit and a 32-bit APK into a single APK
 
 This script is used to merge two APKs which have only 32-bit or 64-bit
 binaries respectively into a APK that has both 32-bit and 64-bit binaries
 for 64-bit Android platform.
@@ skipping 117 matching lines @@
       compress = not uncompress_shared_libraries
     else:
       compress = expected_files[os.path.basename(diff_file)]
     build_utils.AddToZipHermetic(out_zip,
                                  diff_file,
                                  os.path.join(tmp_dir_32, diff_file),
                                  compress=compress)
 
 
 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,
         key_name,
         key_password,
         tmp_apk,
         signed_tmp_apk)
   except build_utils.CalledProcessError as e:
     raise ApkMergeFailure('Failed to sign APK: ' + e.output)
 
   try:
     finalize_apk.AlignApk(zipalign_path,
+                          page_align_shared_libraries,
                           signed_tmp_apk,
                           new_apk)
   except build_utils.CalledProcessError as e:
     raise ApkMergeFailure('Failed to align APK: ' + e.output)
 
 def GetSecondaryAbi(apk_zipfile, shared_library):
   ret = ''
   for name in apk_zipfile.namelist():
     if os.path.basename(name) == shared_library:
       abi = re.search('(^lib/)(.+)(/' + shared_library + '$)', name).group(2)
@@ skipping 54 matching lines @@
   # Using type=os.path.abspath converts file paths to absolute paths so that
   # we can change working directory without affecting these paths
   parser.add_argument('--apk_32bit', required=True, type=os.path.abspath)
   parser.add_argument('--apk_64bit', required=True, type=os.path.abspath)
   parser.add_argument('--out_apk', required=True, type=os.path.abspath)
   parser.add_argument('--zipalign_path', required=True, type=os.path.abspath)
   parser.add_argument('--keystore_path', required=True, type=os.path.abspath)
   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.
   parser.add_argument('--ignore-classes-dex', action='store_true')
   parser.add_argument('--component-build', action='store_true')
   args = parser.parse_args()
 
   tmp_dir = tempfile.mkdtemp()
   tmp_dir_64 = os.path.join(tmp_dir, '64_bit')
   tmp_dir_32 = os.path.join(tmp_dir, '32_bit')
   tmp_apk = os.path.join(tmp_dir, 'tmp.apk')
   signed_tmp_apk = os.path.join(tmp_dir, 'signed.apk')
   new_apk = args.out_apk
 
   try:
     if args.component_build and args.shared_library:
       raise ApkMergeFailure('--component-build and shared-library shouldn\'t'
                             ' be specified at same time.')
     if not args.component_build and not args.shared_library:
       raise ApkMergeFailure('Either --component-build or shared-library should'
                             ' be specified.')
 
     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
     return 1
   finally:
     shutil.rmtree(tmp_dir)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())