Make android_apk template actually create an apk

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 924c261a6b9529716f50b53d3ce6c68d35b7cf43..d7e0b69499bd63482c5fd5b4bc52ef91be2aef03 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -504,11 +504,18 @@ template("android_apk") {
   final_dex_path = "$gen_dir/classes.dex"
 
   # Just mark these as used for now.
-  assert(!defined(invoker.native_libs)
+  assert(!defined(invoker.native_libs) 
       || invoker.native_libs == [] || true)
-  assert(!defined(invoker.final_apk_path)

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

Do we no longer want this assert? Or is this not needed because referencing
invoker.final_apk_path down below will fail?

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

Yeah, it's not needed now that invoker.final_apk_path is used.

(gn will fail if you have an unused variable)

-      || invoker.final_apk_path == "" || true)
 
+  _keystore_path = android_default_keystore_path
+  _keystore_name = android_default_keystore_name
+  _keystore_password = android_default_keystore_password
+
+  if (defined(invoker.keystore_path)) {
+    _keystore_path = invoker.keystore_path
+    _keystore_name = invoker.keystore_name
+    _keystore_password = invoker.keystore_password
+  }
 
   # TODO(cjhopman): Remove this once we correctly generate the real
   # NativeLibraries.java
@@ -558,6 +565,20 @@ template("android_apk") {
     args = ["--inputs=@FileArg($dex_arg_key)"]
   }
 
+  final_deps += [":${target_name}__create"]
+  create_apk("${target_name}__create") {
+    apk_path = invoker.final_apk_path
+    android_manifest = invoker.android_manifest
+    resources_zip = all_resources_zip_path
+    classes_dex_path = final_dex_path
+
+    keystore_name = _keystore_name
+    keystore_path = _keystore_path
+    keystore_password = _keystore_password
+
+    # TODO: native libs
+  }
+
   group(target_name) {
     deps = final_deps
   }