Make android_apk template actually create an apk

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 002320c5305946ba0f0ab94528a4accaba543dbe..b46ebf28f89c8cb6574805936761b909de5e67f9 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -145,6 +145,143 @@ template("dex") {
   }
 }
 
+# Packages resources, assets, dex, and native libraries into an apk. Signs and
+# zipaligns the apk.
+template("create_apk") {
+  _android_manifest = invoker.android_manifest
+  _base_path = invoker.base_path
+  _final_apk_path = invoker.apk_path
+  _resources_zip = invoker.resources_zip
+  _dex_path = invoker.classes_dex_path

[newt (away), 2014/07/30 21:23:14]

any reason not to use the same name for both of these, e.g. "_dex_path" and
"invoker.dex_path" ?

[cjhopman, 2014/07/31 22:15:05]

Ah, this was more useful before I had come up with a pattern to prevent
template/target invocations from inheriting random stuff into 'invoker'.

+  _keystore_path = invoker.keystore_path
+  _keystore_name = invoker.keystore_name
+  _keystore_password = invoker.keystore_password
+
+  _deps = []
+  if (defined(invoker.deps)) {
+    _deps = invoker.deps
+  }
+
+  _native_libs_dir = "//build/android/empty/res"

[newt (away), 2014/07/30 21:23:14]

this path looks wrong (or at least oddly named)

[cjhopman, 2014/07/31 22:15:05]

It's just a guaranteed to be empty path. I could make a new one for this, but
once this supports native libraries it wouldn't be needed anymore. Figured I'd
just use this one for now.

+  if (defined(invoker.native_libs_dir)) {
+      _native_libs_dir = invoker.native_libs_dir
+  }
+
+  _asset_location = "//build/android/empty/res"
+  if (defined(invoker.asset_location)) {
+    _asset_location = invoker.asset_location
+  }
+
+  _version_code = "0"
+  _version_name = "Developer Build"
+
+  _base_apk_path = _base_path + ".apk_intermediates"
+
+  _resource_packaged_apk_path = _base_apk_path + ".ap_"
+  _packaged_apk_path = _base_apk_path + ".unfinished.apk"
+
+
+  _configuration_name = "Release"
+  if (is_debug) {
+    _configuration_name = "Debug"
+  }
+
+  action("${target_name}__package_resources") {
+    deps = _deps
+
+    script = "//build/android/gyp/package_resources.py"
+    depfile = "${target_gen_dir}/${target_name}.d"
+    source_prereqs = [
+      _android_manifest,
+      _resources_zip,
+    ]
+    outputs = [depfile, _resource_packaged_apk_path]
+
+    _rebased_resources_zips = [rebase_path(_resources_zip, root_build_dir)]
+    args = [
+        "--depfile", rebase_path(depfile, root_build_dir),
+        "--android-sdk", rebased_android_sdk,
+        "--android-sdk-tools", rebased_android_sdk_build_tools,
+
+        "--configuration-name=$_configuration_name",
+
+        "--android-manifest", rebase_path(_android_manifest, root_build_dir),
+        "--version-code", _version_code,
+        "--version-name", _version_name,
+
+        "--asset-dir", rebase_path(_asset_location, root_build_dir),
+        "--resource-zips=$_rebased_resources_zips",
+
+        "--apk-path", rebase_path(_resource_packaged_apk_path, root_build_dir),
+      ]
+  }
+
+  action("${target_name}__package") {
+    script = "//build/android/gyp/ant.py"
+    _ant_script = "//build/android/ant/apk-package.xml"
+
+    depfile = "$target_gen_dir/$target_name.d"
+
+    source_prereqs = [
+      _dex_path,
+      _resource_packaged_apk_path,
+      _ant_script
+    ]
+
+    outputs = [
+      depfile,
+      _packaged_apk_path,
+    ]
+
+    _rebased_emma_jar = ""
+    _rebased_resource_packaged_apk_path = rebase_path(_resource_packaged_apk_path, root_build_dir)
+    _rebased_packaged_apk_path = rebase_path(_packaged_apk_path, root_build_dir)
+    _rebased_native_libs_dir = rebase_path(_native_libs_dir, root_build_dir)
+    _rebased_dex_path = rebase_path(_dex_path, 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=$_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",
+      "-DDEX_FILE_PATH=$_rebased_dex_path",
+
+      "-Dbasedir=.",
+      "-buildfile", rebase_path(_ant_script, root_build_dir)
+    ]
+  }
+
+  action("${target_name}__finalize") {
+    script = "//build/android/gyp/finalize_apk.py"
+    depfile = "$target_gen_dir/$target_name.d"
+
+    sources = [_packaged_apk_path]
+    source_prereqs = [_keystore_path]
+    outputs = [depfile, _final_apk_path]
+
+    args = [
+      "--depfile", rebase_path(depfile, root_build_dir),
+      "--zipalign-path", rebase_path(zipalign_path, root_build_dir),
+      "--unsigned-apk-path", rebase_path(_packaged_apk_path, root_build_dir),
+      "--final-apk-path", rebase_path(_final_apk_path, root_build_dir),
+      "--key-path", rebase_path(_keystore_path, root_build_dir),
+      "--key-name", _keystore_name,
+      "--key-passwd", _keystore_password,
+    ]
+  }
+
+  group(target_name) {

[newt (away), 2014/07/30 21:23:14]

do you need to use a group here? Could you just change the final action's name
to "${target_name}"?

[cjhopman, 2014/07/31 22:15:05]

Yeah, I could. I've basically followed the pattern where if there is more than
one action in the template, it uses a group. I find that easiest to understand.

+    deps = [":${target_name}__finalize"]
+  }
+}
+
 # Compiles and jars a set of java files.
 #
 # Outputs: