Make android_apk template actually create an apk

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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//tools/grit/grit_rule.gni")
 
 assert(is_android)
 
@@ skipping 488 matching lines @@
   build_config = "$base_path.build_config"
   resources_zip_path = "$base_path.resources.zip"
   all_resources_zip_path = "$base_path.resources.all.zip"
   resource_srcjar_path = "$base_path.resources.srcjar"
   jar_path = "$base_path.jar"
   final_dex_path = "$gen_dir/classes.dex"
 
   # Just mark these as used for now.
   assert(!defined(invoker.native_libs)
       || invoker.native_libs == [] || true)
-  assert(!defined(invoker.final_apk_path)
-      || 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
   srcjar_deps = [ "//base:base_native_libraries_gen" ]
   if (defined(invoker.srcjar_deps)) {
     srcjar_deps += invoker.srcjar_deps
   }
 
   write_build_config("${target_name}__build_config") {
     type = "android_apk"
@@ skipping 29 matching lines @@
 
   final_deps += [":${target_name}__final_dex"]
   dex("${target_name}__final_dex") {
     sources = [jar_path]
     inputs = [build_config]
     output = final_dex_path
     dex_arg_key = "${rebased_build_config}:apk_dex:dependency_dex_files"
     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
+    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
   }
 }
 
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
@@ skipping 18 matching lines @@
       "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java"
     ]
     android_manifest = "//testing/android/java/AndroidManifest.xml"
     unittests_outputs = get_target_outputs(invoker.unittests_dep)
     native_libs = [unittests_outputs[0]]
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
   }
 }