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

build/android/gyp/finalize_apk.py

Index: build/android/gyp/finalize_apk.py
diff --git a/build/android/gyp/finalize_apk.py b/build/android/gyp/finalize_apk.py
index 532d001f72385dbee29c8c986ef5780db2830467..ecb5ebfe765efa463f2db0d9e1ae5e1200c014a0 100755
--- a/build/android/gyp/finalize_apk.py
+++ b/build/android/gyp/finalize_apk.py
@@ -21,32 +21,6 @@ import resource_sizes  # pylint: disable=unused-import
 
 from util import build_utils
 
-def RenameInflateAndAddPageAlignment(
-    rezip_apk_jar_path, in_zip_file, out_zip_file):
-  rezip_apk_cmd = [
-      'java',
-      '-classpath',
-      rezip_apk_jar_path,
-      'RezipApk',
-      'renamealign',
-      in_zip_file,
-      out_zip_file,
-    ]
-  build_utils.CheckOutput(rezip_apk_cmd)
-
-
-def ReorderAndAlignApk(rezip_apk_jar_path, in_zip_file, out_zip_file):
-  rezip_apk_cmd = [
-      'java',
-      '-classpath',
-      rezip_apk_jar_path,
-      'RezipApk',
-      'reorder',
-      in_zip_file,
-      out_zip_file,
-    ]
-  build_utils.CheckOutput(rezip_apk_cmd)
-
 
 def JarSigner(key_path, key_name, key_passwd, unsigned_path, signed_path):
   shutil.copy(unsigned_path, signed_path)
@@ -62,14 +36,15 @@ def JarSigner(key_path, key_name, key_passwd, unsigned_path, signed_path):
   build_utils.CheckOutput(sign_cmd)
 
 
-def AlignApk(zipalign_path, package_align, unaligned_path, final_path):
+def AlignApk(zipalign_path, unaligned_path, final_path):
+  # Note -p will page align native libraries (files ending with .so), but
+  # only those that are stored uncompressed.
   align_cmd = [
       zipalign_path,
-      '-f'
+      '-p',
+      '-f',
       ]
 
-  if package_align:
-    align_cmd += ['-p']
 
   align_cmd += [
       '4',  # 4 bytes
@@ -85,23 +60,13 @@ def main(args):
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
 
-  parser.add_option('--rezip-apk-jar-path',
-                    help='Path to the RezipApk jar file.')
   parser.add_option('--zipalign-path', help='Path to the zipalign tool.')
-  parser.add_option('--page-align-shared-libraries',
-                    action='store_true',
-                    help='Page align shared libraries.')
   parser.add_option('--unsigned-apk-path', help='Path to input unsigned APK.')
   parser.add_option('--final-apk-path',
       help='Path to output signed and aligned APK.')
   parser.add_option('--key-path', help='Path to keystore for signing.')
   parser.add_option('--key-passwd', help='Keystore password')
   parser.add_option('--key-name', help='Keystore name')
-  parser.add_option('--stamp', help='Path to touch on success.')
-  parser.add_option('--load-library-from-zip', type='int',
-      help='If non-zero, build the APK such that the library can be loaded ' +
-           'directly from the zip file using the crazy linker. The library ' +
-           'will be renamed, uncompressed and page aligned.')
 
   options, _ = parser.parse_args()
 
@@ -110,14 +75,9 @@ def main(args):
     options.key_path,
   ]
 
-  if options.load_library_from_zip:
-    input_paths.append(options.rezip_apk_jar_path)
-
   input_strings = [
-    options.load_library_from_zip,
     options.key_name,
     options.key_passwd,
-    options.page_align_shared_libraries,
   ]
 
   build_utils.CallAndWriteDepfileIfStale(
@@ -129,57 +89,34 @@ def main(args):
       output_paths=[options.final_apk_path])
 
 
-def FinalizeApk(options):
-  with tempfile.NamedTemporaryFile() as signed_apk_path_tmp, \
-      tempfile.NamedTemporaryFile() as apk_to_sign_tmp:
-
-    if options.load_library_from_zip:
-      # We alter the name of the library so that the Android Package Manager
-      # does not extract it into a separate file. This must be done before
-      # signing, as the filename is part of the signed manifest. At the same
-      # time we uncompress the library, which is necessary so that it can be
-      # loaded directly from the APK.
-      # Move the library to a page boundary by adding a page alignment file.
-      apk_to_sign = apk_to_sign_tmp.name
-      RenameInflateAndAddPageAlignment(
-          options.rezip_apk_jar_path, options.unsigned_apk_path, apk_to_sign)
-    else:
-      apk_to_sign = options.unsigned_apk_path
+def _NormalizeZip(path):
+  with tempfile.NamedTemporaryFile(suffix='.zip') as hermetic_signed_apk:
+    with zipfile.ZipFile(path, 'r') as zi:
+      with zipfile.ZipFile(hermetic_signed_apk, 'w') as zo:
+        for info in zi.infolist():
+          # Ignore 'extended local file headers'. Python doesn't write them
+          # properly (see https://bugs.python.org/issue1742205) which causes
+          # zipalign to miscalculate alignment. Since we don't use them except
+          # for alignment anyway, we write a stripped file here and let
+          # zipalign add them properly later. eLFHs are controlled by 'general
+          # purpose bit flag 03' (0x08) so we mask that out.
+          info.flag_bits = info.flag_bits & 0xF7
 
+          info.date_time = build_utils.HERMETIC_TIMESTAMP
+          zo.writestr(info, zi.read(info.filename))
+
+    shutil.copy(hermetic_signed_apk.name, path)
+
+
+def FinalizeApk(options):
+  with tempfile.NamedTemporaryFile() as signed_apk_path_tmp:
     signed_apk_path = signed_apk_path_tmp.name
     JarSigner(options.key_path, options.key_name, options.key_passwd,
-              apk_to_sign, signed_apk_path)
-
-    # Make the signing files hermetic.
-    with tempfile.NamedTemporaryFile(suffix='.zip') as hermetic_signed_apk:
-      with zipfile.ZipFile(signed_apk_path, 'r') as zi:
-        with zipfile.ZipFile(hermetic_signed_apk, 'w') as zo:
-          for info in zi.infolist():
-            # Ignore 'extended local file headers'. Python doesn't write them
-            # properly (see https://bugs.python.org/issue1742205) which causes
-            # zipalign to miscalculate alignment. Since we don't use them except
-            # for alignment anyway, we write a stripped file here and let
-            # zipalign add them properly later. eLFHs are controlled by 'general
-            # purpose bit flag 03' (0x08) so we mask that out.
-            info.flag_bits = info.flag_bits & 0xF7
-
-            info.date_time = build_utils.HERMETIC_TIMESTAMP
-            zo.writestr(info, zi.read(info.filename))
-
-      shutil.copy(hermetic_signed_apk.name, signed_apk_path)
-
-    if options.load_library_from_zip:
-      # Reorder the contents of the APK. This re-establishes the canonical
-      # order which means the library will be back at its page aligned location.
-      # This step also aligns uncompressed items to 4 bytes.
-      ReorderAndAlignApk(
-          options.rezip_apk_jar_path, signed_apk_path, options.final_apk_path)
-    else:
-      # Align uncompressed items to 4 bytes
-      AlignApk(options.zipalign_path,
-               options.page_align_shared_libraries,
-               signed_apk_path,
-               options.final_apk_path)
+              options.unsigned_apk_path, signed_apk_path)
+    # Make the newly added signing files hermetic.
+    _NormalizeZip(signed_apk_path)
+
+    AlignApk(options.zipalign_path, signed_apk_path, options.final_apk_path)
 
 
 if __name__ == '__main__':