Support uncompress and page align shared libraries

build/android/gyp/apkbuilder.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2015 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.
 
 """Adds the code parts to a resource APK."""
 
 import argparse
 import itertools
@@ skipping 39 matching lines @@
                       help='GYP-list of native libraries to include. '
                            'Can be specified multiple times.',
                       default=[])
   parser.add_argument('--android-abi',
                       help='Android architecture to use for native libraries')
   parser.add_argument('--native-lib-placeholders',
                       help='GYP-list of native library placeholders to add.',
                       default='[]')
   parser.add_argument('--emma-device-jar',
                       help='Path to emma_device.jar to include.')
+  parser.add_argument('--uncompress-shared-libraries',
+                      action='store_true',
+                      help='Uncompress shared libraries')
   options = parser.parse_args(args)
   options.assets = build_utils.ParseGypList(options.assets)
   options.uncompressed_assets = build_utils.ParseGypList(
       options.uncompressed_assets)
   options.native_lib_placeholders = build_utils.ParseGypList(
       options.native_lib_placeholders)
   all_libs = []
   for gyp_list in options.native_libs:
     all_libs.extend(build_utils.ParseGypList(gyp_list))
   options.native_libs = all_libs
@@ skipping 133 matching lines @@
             for dex in (d for d in dex_zip.namelist() if d.endswith('.dex')):
               build_utils.AddToZipHermetic(out_apk, dex, data=dex_zip.read(dex))
         elif options.dex_file:
           build_utils.AddToZipHermetic(out_apk, 'classes.dex',
                                        src_path=options.dex_file)
 
         # 5. Native libraries.
         for path in native_libs:
           basename = os.path.basename(path)
           apk_path = 'lib/%s/%s' % (options.android_abi, basename)
-          build_utils.AddToZipHermetic(out_apk, apk_path, src_path=path)
+
+          compress = not (options.uncompress_shared_libraries and

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

I'm not sure this is exactly right. This is forcing the behaviour in all cases.
I think instead you want that if it's a shared library and your flag is set,
don't zip, otherwise pass none (to mimic previous behaviour)

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

Thanks, I should keep previous behavior.

+                          os.path.splitext(basename)[1] == '.so')
+
+          build_utils.AddToZipHermetic(out_apk,
+                                       apk_path,
+                                       src_path=path,
+                                       compress=compress)
 
         for name in sorted(options.native_lib_placeholders):
           # Empty libs files are ignored by md5check, but rezip requires them
           # to be empty in order to identify them as placeholders.
           apk_path = 'lib/%s/%s' % (options.android_abi, name)
           build_utils.AddToZipHermetic(out_apk, apk_path, data='')
 
         # 6. Java resources. Used only when coverage is enabled, so order
         # doesn't matter).
         if options.emma_device_jar:
@@ skipping 21 matching lines @@
   build_utils.CallAndWriteDepfileIfStale(
       on_stale_md5,
       options,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=[options.output_apk])
 
 
 if __name__ == '__main__':
   main(sys.argv[1:])