diff options
| author | nyquist <nyquist@chromium.org> | 2015-09-04 16:09:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-04 23:10:30 +0000 |
| commit | fbc342116e60698aae09bf4175a30bf8ccc14704 (patch) | |
| tree | 992664871c717797a198b663db39184b640b793a /build/config/android/config.gni | |
| parent | 2800acc52631edae823f59b798ae48fb0203f4f1 (diff) | |
| download | chromium_src-fbc342116e60698aae09bf4175a30bf8ccc14704.zip chromium_src-fbc342116e60698aae09bf4175a30bf8ccc14704.tar.gz chromium_src-fbc342116e60698aae09bf4175a30bf8ccc14704.tar.bz2 | |
Add support for overriding keystore for signing.
This CL adds support for overriding android_keystore_path,
android_keystore_name, android_keystore_password from other config
files.
It also adds documentation to these arguments and removes 'default'
from their name.
The chromium debug key is still used by default for all builds.
BUG=479253
Review URL: https://codereview.chromium.org/1311043014
Cr-Commit-Position: refs/heads/master@{#347521}
Diffstat (limited to 'build/config/android/config.gni')
| -rw-r--r-- | build/config/android/config.gni | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 613b29d..7425e3f 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 |