GN: Use a custom script for package_apk() build step rather than ANT

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/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 465 matching lines @@
 #   output_apk_path: Output path for the generated .apk.
 #   native_libs_dir: Directory containing native libraries.
 template("package_apk") {
   action(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
                              "public_deps",
                              "testonly",
                            ])
-    script = "//build/android/gyp/ant.py"
-    _ant_script = "//build/android/ant/apk-package.xml"
-
+    script = "//build/android/gyp/apkbuilder.py"
     depfile = "$target_gen_dir/$target_name.d"
     data_deps = [ "//tools/android/md5sum" ]  # Used when deploying APKs
 
     inputs = [
       invoker.resource_packaged_apk_path,
-      _ant_script,
     ]
     if (defined(invoker.dex_path)) {
       inputs += [ invoker.dex_path ]
     }
 
     outputs = [
       depfile,
       invoker.output_apk_path,
     ]
 
-    _rebased_emma_jar = ""
     _rebased_resource_packaged_apk_path =
         rebase_path(invoker.resource_packaged_apk_path, root_build_dir)
     _rebased_packaged_apk_path =
         rebase_path(invoker.output_apk_path, root_build_dir)
-    _rebased_native_libs_dir =
-        rebase_path(invoker.native_libs_dir, root_build_dir)
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
-      "--",
-      "-quiet",
-      "-DANDROID_SDK_ROOT=$rebased_android_sdk_root",
-      "-DANDROID_SDK_TOOLS=$rebased_android_sdk_build_tools",
-      "-DRESOURCE_PACKAGED_APK_NAME=$_rebased_resource_packaged_apk_path",
-      "-DCONFIGURATION_NAME=$android_configuration_name",
-      "-DNATIVE_LIBS_DIR=$_rebased_native_libs_dir",
-      "-DOUT_DIR=",
-      "-DUNSIGNED_APK_PATH=$_rebased_packaged_apk_path",
-      "-DEMMA_INSTRUMENT=0",
-      "-DEMMA_DEVICE_JAR=$_rebased_emma_jar",
-      "-Dbasedir=.",
-      "-buildfile",
-      rebase_path(_ant_script, root_build_dir),
+      "--resource-apk=$_rebased_resource_packaged_apk_path",
+      "--output-apk=$_rebased_packaged_apk_path",
     ]
     if (defined(invoker.dex_path)) {
       _rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
+      args += [ "--dex-file=$_rebased_dex_path" ]
+    }
+    if (defined(invoker.native_libs_dir)) {
+      _rebased_native_libs_dir =
+          rebase_path(invoker.native_libs_dir, root_build_dir)
       args += [
-        "-DDEX_FILE_PATH=$_rebased_dex_path",
-        "-DHAS_CODE=true",
+        "--native-libs-dir=$_rebased_native_libs_dir/$android_app_abi",
+        "--android-abi=$android_app_abi",
       ]
-    } else {
-      args += [ "-DHAS_CODE=false" ]
     }
   }
 }
 
 # 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.
@@ skipping 73 matching lines @@
   if (defined(invoker.dex_path)) {
     _dex_path = invoker.dex_path
   }
   _load_library_from_apk = invoker.load_library_from_apk
 
   _deps = []
   if (defined(invoker.deps)) {
     _deps = invoker.deps
   }
 
-  _native_libs_dir = "//build/android/empty/res"
-  if (defined(invoker.native_libs_dir)) {
-    _native_libs_dir = invoker.native_libs_dir
-  }
-
   if (defined(invoker.asset_location)) {
     _asset_location = invoker.asset_location
     assert(_asset_location != "")  # Mark as used.
   }
 
   _version_code = invoker.version_code
   _version_name = invoker.version_name
   assert(_version_code != -1)  # Mark as used.
   assert(_version_name != "")  # Mark as used.
 
@@ skipping 143 matching lines @@
   # from the result of the main package_resources step.
   package_resources_helper(_incremental_package_resources_target_name) {
     forward_variables_from(invoker, [ "extensions_to_not_compress" ])
     deps = _deps + [ ":$_generate_incremental_manifest_target_name" ]
     android_manifest = _incremental_android_manifest
     resource_packaged_apk_path = _incremental_resource_packaged_apk_path
   }
 
   package_target = "${target_name}__package"
   package_apk(package_target) {
+    forward_variables_from(invoker, [ "native_libs_dir" ])
     deps = _deps + [ ":${_package_resources_target_name}" ]
 
     if (defined(_dex_path)) {
       dex_path = _dex_path
     }
-    native_libs_dir = _native_libs_dir
+
     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) {
     _dex_target = "//build/android/incremental_install:bootstrap_java__dex"
     deps = _deps + [
              ":${_incremental_package_resources_target_name}",
              _dex_target,
            ]
 
     if (defined(_dex_path)) {
       dex_path =
           get_label_info(_dex_target, "target_gen_dir") + "/bootstrap.dex"
     }
 
     # TODO(agrieve): Add a placeholder .so for http://crbug.com/384638
-    native_libs_dir = "//build/android/empty/res"
     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) {
     input_apk_path = _packaged_apk_path
     output_apk_path = _final_apk_path
     keystore_path = _keystore_path
     keystore_name = _keystore_name
@@ skipping 809 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }