Support uncompress and page align shared libraries

build/config/android/internal_rules.gni

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 746 matching lines @@
     }
     if (_native_lib_placeholders != []) {
       args += [ "--native-lib-placeholders=$_native_lib_placeholders" ]
     }
 
     if (defined(invoker.emma_instrument) && invoker.emma_instrument) {
       _emma_device_jar = "$android_sdk_root/tools/lib/emma_device.jar"
       _rebased_emma_device_jar = rebase_path(_emma_device_jar, root_build_dir)
       args += [ "--emma-device-jar=$_rebased_emma_device_jar" ]
     }
+
+    if (defined(invoker.uncompress_shared_libraries) &&
+        invoker.uncompress_shared_libraries) {
+      args += [ "--uncompress-shared-libraries" ]
+    }
   }
 }
 
 # Signs & zipaligns an apk.
 #
 # Variables
 #   input_apk_path: Path of the .apk to be finalized.
 #   output_apk_path: Output path for the generated .apk.
 #   keystore_path: Path to keystore to use for signing.
 #   keystore_name: Key alias to use.
@@ skipping 41 matching lines @@
     ]
     if (defined(invoker.rezip_apk) && invoker.rezip_apk) {
       deps += [ "//build/android/rezip" ]
       _rezip_jar_path = "$root_build_dir/lib.java/rezip_apk.jar"
       args += [
         "--load-library-from-zip=1",
         "--rezip-apk-jar-path",
         rebase_path(_rezip_jar_path, root_build_dir),
       ]
     }
+
+    if (defined(invoker.page_align_shared_libraries) &&
+        invoker.page_align_shared_libraries) {
+      args += [ "--page-align-shared-libraries" ]
+    }
   }
 }
 
 # Packages resources, assets, dex, and native libraries into an apk. Signs and
 # zipaligns the apk.
 template("create_apk") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   _android_manifest = invoker.android_manifest
@@ skipping 216 matching lines @@
   }
 
   package_target = "${target_name}__package"
   package_apk(package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
                              "native_lib_placeholders",
                              "native_libs_filearg",
+                             "uncompress_shared_libraries",
                              "write_asset_list",
                            ])
     deps = _deps + [ ":${_package_resources_target_name}" ]
     native_libs = _native_libs + _native_libs_even_when_incremental
 
     if (defined(_dex_path)) {
       dex_path = _dex_path
     }
 
     output_apk_path = _packaged_apk_path
     resource_packaged_apk_path = _resource_packaged_apk_path
   }
 
   _incremental_package_target = "${target_name}_incremental__package"
   package_apk(_incremental_package_target) {
     forward_variables_from(invoker,
                            [
                              "assets_build_config",
                              "emma_instrument",
+                             "uncompress_shared_libraries",
                            ])
     _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
     deps = _incremental_deps + [
              ":${_incremental_package_resources_target_name}",
              _dex_target,
            ]
 
     if (defined(_dex_path)) {
       dex_path =
           get_label_info(_dex_target, "target_gen_dir") + "/bootstrap.dex"
     }
 
     native_libs = _native_libs_even_when_incremental
 
     # http://crbug.com/384638
     _has_native_libs =
         defined(invoker.native_libs_filearg) || _native_libs != []
     if (_has_native_libs && _native_libs_even_when_incremental == []) {
       native_lib_placeholders = [ "libfix.crbug.384638.so" ]
     }
 
     output_apk_path = _incremental_packaged_apk_path
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   _finalize_apk_rule_name = "${target_name}__finalize"
   finalize_apk(_finalize_apk_rule_name) {
+    forward_variables_from(invoker, [ "page_align_shared_libraries" ])
+
     input_apk_path = _packaged_apk_path
     output_apk_path = _final_apk_path
     keystore_path = _keystore_path
     keystore_name = _keystore_name
     keystore_password = _keystore_password
     rezip_apk = _load_library_from_apk
 
     public_deps = [
       # Generator of the _packaged_apk_path this target takes as input.
       ":$package_target",
     ]
   }
 
   _incremental_finalize_apk_rule_name = "${target_name}_incremental__finalize"
   finalize_apk(_incremental_finalize_apk_rule_name) {
+    forward_variables_from(invoker, [ "page_align_shared_libraries" ])

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

did you test this? incremental apks have a special way of loading shared
libraries as it is. No idea if is actually needed. 

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

No, I didn't test it, actually, I don't know how to test, but comparing to the
similar variable load_library_from_apk, it seemed we don't need this.

+
     input_apk_path = _incremental_packaged_apk_path
     output_apk_path = _incremental_final_apk_path
     keystore_path = _keystore_path
     keystore_name = _keystore_name
     keystore_password = _keystore_password
 
     public_deps = [
       ":$_incremental_package_target",
     ]
   }
@@ skipping 947 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }