Support uncompress and page align shared libraries

build/android/gyp/finalize_apk.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 """Signs and zipaligns APK.
 
 """
 
 import optparse
@@ skipping 37 matching lines @@
       '-sigalg', 'MD5withRSA',
       '-digestalg', 'SHA1',
       '-keystore', key_path,
       '-storepass', key_passwd,
       signed_path,
       key_name,
     ]
   build_utils.CheckOutput(sign_cmd)
 
 
-def AlignApk(zipalign_path, unaligned_path, final_path):
+def AlignApk(zipalign_path, package_align, unaligned_path, final_path):
   align_cmd = [
       zipalign_path,
-      '-f', '4',  # 4 bytes
+      '-f'
+      ]
+
+  if package_align:
+    align_cmd += ['-p']

[Yaron, 2016/01/21 20:22:46]

Is there a reason we don't do this always?

[michaelbai, 2016/01/21 21:58:03]

For the compressed shared libraries, there is no benefit to page align them, and
the apk size will be increased.

+
+  align_cmd += [
+      '4',  # 4 bytes
       unaligned_path,
       final_path,
       ]
   build_utils.CheckOutput(align_cmd)
 
 
 def main(args):
   args = build_utils.ExpandFileArgs(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()
 
   input_paths = [
     options.unsigned_apk_path,
     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(
       lambda: FinalizeApk(options),
       options,
       record_path=options.unsigned_apk_path + '.finalize.md5.stamp',
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.final_apk_path])
 
@@ skipping 20 matching lines @@
               apk_to_sign, 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, signed_apk_path, options.final_apk_path)
+      AlignApk(options.zipalign_path,
+               options.page_align_shared_libraries,
+               signed_apk_path,
+               options.final_apk_path)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))