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

build/config/android/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/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1989 matching lines @@
           deps += _secondary_abi_native_libs_deps
           deps += [ ":$build_config_target" ]
         }
       }
     }
 
     _extra_native_libs = []
     _extra_native_libs_deps = []
     assert(_extra_native_libs_deps == [])  # Mark as used.
     _extra_native_libs_even_when_incremental = []
+    _extra_native_libs_even_when_incremental_deps = []
+    assert(_extra_native_libs_even_when_incremental_deps == [])  # Mark as used.
     if (_native_libs_deps != []) {
+      # zipalign can't align gdb_server, don't pack gdbserver temporarily.
+      if (is_debug && (!defined(invoker.page_align_shared_libraries) ||
+                       !invoker.page_align_shared_libraries)) {
+        _extra_native_libs_even_when_incremental = [ android_gdbserver ]
+      }
+
       if (_use_chromium_linker) {
         _extra_native_libs =
             [ "$root_shlib_dir/libchromium_android_linker$shlib_extension" ]
         _extra_native_libs_deps +=
             [ "//base/android/linker:chromium_android_linker" ]
       }
     }
     if (defined(invoker.loadable_modules) && invoker.loadable_modules != []) {
       _extra_native_libs_even_when_incremental += invoker.loadable_modules
     }
 
     _final_deps += [ ":${_template_name}__create" ]
     create_apk("${_template_name}__create") {
       forward_variables_from(invoker,
                              [
                                "alternative_android_sdk_jar",
                                "android_aapt_path",
                                "app_as_shared_lib",
                                "deps",
                                "extensions_to_not_compress",
                                "language_splits",
+                               "page_align_shared_libraries",
                                "public_deps",
                                "secondary_native_libs",
                                "shared_resources",
                                "uncompress_shared_libraries",
                                "write_asset_list",
                              ])
       if (!defined(deps)) {
         deps = []
       }
       apk_path = _final_apk_path
@@ skipping 29 matching lines @@
       deps += _android_manifest_deps + [
                 ":$build_config_target",
                 ":$process_resources_target",
                 ":$final_dex_target_name",
               ]
 
       if ((_native_libs_deps != [] ||
            _extra_native_libs_even_when_incremental != []) &&
           !_create_abi_split) {
         deps += _native_libs_deps + _extra_native_libs_deps +
+                _extra_native_libs_even_when_incremental_deps +
                 [ _native_libs_file_arg_dep ]
         native_libs_filearg = _native_libs_file_arg
         native_libs = _extra_native_libs
         native_libs_even_when_incremental =
             _extra_native_libs_even_when_incremental
       }
 
       if (_secondary_abi_native_libs_deps != [] && !_create_abi_split) {
         deps += _secondary_abi_native_libs_deps +
                 [ _secondary_abi_native_libs_file_arg_dep ]
@@ skipping 40 matching lines @@
         deps = []
         forward_variables_from(invoker,
                                [
                                  "alternative_android_sdk_jar",
                                  "android_aapt_path",
                                  "deps",
                                  "native_lib_placeholders",
                                  "public_deps",
                                ])
 
-        incremental_deps = deps + [ ":$_manifest_rule" ]
+        incremental_deps =
+            deps + _extra_native_libs_even_when_incremental_deps +
+            [ ":$_manifest_rule" ]
         deps = []
         deps = incremental_deps + _native_libs_deps + _extra_native_libs_deps +
                [ _native_libs_file_arg_dep ]
         native_libs_filearg = _native_libs_file_arg
         native_libs = _extra_native_libs
         native_libs_even_when_incremental =
             _extra_native_libs_even_when_incremental
       }
     }
 
@@ skipping 665 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }