Support uncompress and page align shared libraries

build/android/gyp/apkbuilder.py

Index: build/android/gyp/apkbuilder.py
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py
index 8c7a449fbb20b767401e95c5fb69a754294f0df0..2993e322eab1ce2273981b13219c7a3474e374c5 100755
--- a/build/android/gyp/apkbuilder.py
+++ b/build/android/gyp/apkbuilder.py
@@ -57,6 +57,9 @@ def _ParseArgs(args):
                       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(
@@ -210,7 +213,14 @@ def main(args):
         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