Add support for overriding keystore for signing.

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 190cd20414a9b13d681cebcf768508ebdacae617..f076db5adcd967402eb59127af07b0eb7a6843f8 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1179,9 +1179,9 @@ template("android_apk") {
   if (defined(invoker.version_name)) {
     _version_name = invoker.version_name
   }
-  _keystore_path = android_default_keystore_path
-  _keystore_name = android_default_keystore_name
-  _keystore_password = android_default_keystore_password
+  _keystore_path = default_android_keystore_path

[agrieve, 2015/09/04 19:34:40]

I think you want this to be android_keystore_path (no default)

[nyquist, 2015/09/04 20:06:10]

Doh! Yes!

+  _keystore_name = default_android_keystore_name
+  _keystore_password = default_android_keystore_password
 
   if (defined(invoker.keystore_path)) {
     _keystore_path = invoker.keystore_path