Support uncompress and page align shared libraries

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
 
 """
 
 import os
@@ skipping 103 matching lines @@
 
 def RemoveMetafiles(tmp_apk):
   """ Remove all meta info to avoid certificate clashes """
   try:
     build_utils.CheckOutput(['zip', '-d', tmp_apk, 'META-INF/*'])
   except build_utils.CalledProcessError as e:
     raise ApkMergeFailure('Failed to delete Meta folder: ' + e.output)
 
 
 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, signed_tmp_apk, new_apk)
+    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 main():
   parser = argparse.ArgumentParser(
       description='Merge a 32-bit APK into a 64-bit APK')
   # 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', required=True)
+  parser.add_argument('--page-align-shared-libraries', action='store_true')
+  parser.add_argument('--uncompress-shared-libraries', 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
 
   # Expected files to copy from 32- to 64-bit APK together with an extra flag
   # setting the compression level of the file
   expected_files = {'snapshot_blob_32.bin': ['-0'],
                     'natives_blob_32.bin': ['-0'],
                     args.shared_library: []}
 
+  if args.uncompress_shared_libraries:
+    expected_files[args.shared_library] += ['-0']
+
   try:
     shutil.copyfile(args.apk_64bit, tmp_apk)
 
     # need to unpack APKs to compare their contents
     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'])
 
     diff_files = GetDiffFiles(dcmp, tmp_dir_32)
 
     # Check that diff_files match exactly those files we want to insert into
     # the 64-bit APK.
     CheckFilesExpected(diff_files, expected_files)
 
     RemoveMetafiles(tmp_apk)
 
     AddDiffFiles(diff_files, tmp_dir_32, tmp_apk, expected_files)
 
     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())