Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2670)

Unified Diff: build/config/android/config.gni

Issue 1311043014: Add support for overriding keystore for signing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed rules.gni variable usage Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 613b29d62dfc1032221f17302c218a911eb3731c..7425e3f9d2a5544277037aac54b0311e7ed46eab 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -20,6 +20,13 @@ if (is_android) {
default_android_sdk_build_tools_version = "23.0.0"
}
+ if (!defined(default_android_keystore_path)) {
+ default_android_keystore_path =
+ "//build/android/ant/chromium-debug.keystore"
+ default_android_keystore_name = "chromiumdebugkey"
+ default_android_keystore_password = "chromium"
+ }
+
if (!defined(google_play_services_library)) {
google_play_services_library =
"//third_party/android_tools:google_play_services_default_java"
@@ -35,10 +42,14 @@ if (is_android) {
android_sdk_version = default_android_sdk_version
android_sdk_build_tools_version = default_android_sdk_build_tools_version
- android_default_keystore_path =
- "//build/android/ant/chromium-debug.keystore"
- android_default_keystore_name = "chromiumdebugkey"
- android_default_keystore_password = "chromium"
+ # The path to the keystore to use for signing builds.
+ android_keystore_path = default_android_keystore_path
+
+ # The name of the keystore to use for signing builds.
+ android_keystore_name = default_android_keystore_name
+
+ # The password for the keystore to use for signing builds.
+ android_keystore_password = default_android_keystore_password
# This is a unique identifier for a given build. It's used for
# identifying various build artifacts corresponding to a particular build of
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698