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

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 14 matching lines @@
   "*:*_assets",
   "*android*:assets",
   "*:*_apk_*resources",
   "*android*:resources",
   "*:*_resources",
   "*:*_grd",
   "*:*locale_paks",
 
   # TODO(agrieve): Rename targets below to match above patterns.
   "*android_webview/glue:glue",
+  "//build/android/rezip:rezip",
   "//chrome/test/android/cast_emulator:cast_emulator",
 ]
 
 # Targets that match the whitelist but are not actually java targets.
 _java_target_blacklist = [
   "//chrome:packed_resources",
   "//remoting/android:remoting_android_raw_resources",
   "*:*_unpack_aar",
 ]
 
@@ skipping 1332 matching lines @@
   }
 
   # 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.
   #   keystore_password: Keystore password.
+  #   rezip_apk: Whether to add crazy-linker alignment.
   template("finalize_apk") {
     action(target_name) {
       deps = []
       script = "//build/android/gyp/finalize_apk.py"
       depfile = "$target_gen_dir/$target_name.d"
       forward_variables_from(invoker,
                              [
                                "deps",
                                "data_deps",
                                "public_deps",
@@ skipping 22 matching lines @@
         rebase_path(invoker.input_apk_path, root_build_dir),
         "--final-apk-path",
         rebase_path(invoker.output_apk_path, root_build_dir),
         "--key-path",
         rebase_path(invoker.keystore_path, root_build_dir),
         "--key-name",
         invoker.keystore_name,
         "--key-passwd",
         invoker.keystore_password,
       ]
+      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 222 matching lines @@
                              [
                                "assets_build_config",
                                "emma_instrument",
                                "native_lib_placeholders",
                                "native_libs_filearg",
                                "secondary_abi_native_libs_filearg",
                                "secondary_native_libs",
                                "uncompress_shared_libraries",
                                "write_asset_list",
                              ])
-      if (!defined(uncompress_shared_libraries)) {
-        uncompress_shared_libraries = _load_library_from_apk
-      }
       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",
                                "secondary_native_libs",
                                "uncompress_shared_libraries",
                              ])
-      if (!defined(uncompress_shared_libraries)) {
-        uncompress_shared_libraries = _load_library_from_apk
-      }
       _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) {
       input_apk_path = _incremental_packaged_apk_path
@@ skipping 1054 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }