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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This file contains common system config stuff for the Android build. 5 # This file contains common system config stuff for the Android build.
6 6
7 if (is_android) { 7 if (is_android) {
8 has_chrome_android_internal = 8 has_chrome_android_internal =
9 exec_script("//build/dir_exists.py", 9 exec_script("//build/dir_exists.py",
10 [ rebase_path("//clank", root_build_dir) ], 10 [ rebase_path("//clank", root_build_dir) ],
11 "string") == "True" 11 "string") == "True"
12 12
13 if (has_chrome_android_internal) { 13 if (has_chrome_android_internal) {
14 import("//clank/config.gni") 14 import("//clank/config.gni")
15 } 15 }
16 16
17 if (!defined(default_android_sdk_root)) { 17 if (!defined(default_android_sdk_root)) {
18 default_android_sdk_root = "//third_party/android_tools/sdk" 18 default_android_sdk_root = "//third_party/android_tools/sdk"
19 default_android_sdk_version = "23" 19 default_android_sdk_version = "23"
20 default_android_sdk_build_tools_version = "23.0.0" 20 default_android_sdk_build_tools_version = "23.0.0"
21 } 21 }
22 22
23 if (!defined(default_android_keystore_path)) {
24 default_android_keystore_path =
25 "//build/android/ant/chromium-debug.keystore"
26 default_android_keystore_name = "chromiumdebugkey"
27 default_android_keystore_password = "chromium"
28 }
29
23 if (!defined(google_play_services_library)) { 30 if (!defined(google_play_services_library)) {
24 google_play_services_library = 31 google_play_services_library =
25 "//third_party/android_tools:google_play_services_default_java" 32 "//third_party/android_tools:google_play_services_default_java"
26 } 33 }
27 34
28 if (!defined(google_play_services_resources)) { 35 if (!defined(google_play_services_resources)) {
29 google_play_services_resources = 36 google_play_services_resources =
30 "//third_party/android_tools:google_play_services_default_resources" 37 "//third_party/android_tools:google_play_services_default_resources"
31 } 38 }
32 39
33 declare_args() { 40 declare_args() {
34 android_sdk_root = default_android_sdk_root 41 android_sdk_root = default_android_sdk_root
35 android_sdk_version = default_android_sdk_version 42 android_sdk_version = default_android_sdk_version
36 android_sdk_build_tools_version = default_android_sdk_build_tools_version 43 android_sdk_build_tools_version = default_android_sdk_build_tools_version
37 44
38 android_default_keystore_path = 45 # The path to the keystore to use for signing builds.
39 "//build/android/ant/chromium-debug.keystore" 46 android_keystore_path = default_android_keystore_path
40 android_default_keystore_name = "chromiumdebugkey" 47
41 android_default_keystore_password = "chromium" 48 # The name of the keystore to use for signing builds.
49 android_keystore_name = default_android_keystore_name
50
51 # The password for the keystore to use for signing builds.
52 android_keystore_password = default_android_keystore_password
42 53
43 # This is a unique identifier for a given build. It's used for 54 # This is a unique identifier for a given build. It's used for
44 # identifying various build artifacts corresponding to a particular build of 55 # identifying various build artifacts corresponding to a particular build of
45 # chrome (e.g. where to find archived symbols). 56 # chrome (e.g. where to find archived symbols).
46 android_chrome_build_id = "\"\"" 57 android_chrome_build_id = "\"\""
47 58
48 # Set to true to run findbugs on JAR targets. 59 # Set to true to run findbugs on JAR targets.
49 run_findbugs = false 60 run_findbugs = false
50 61
51 # Set to true to enable verbose findbugs logging. This does nothing if 62 # Set to true to enable verbose findbugs logging. This does nothing if
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } else if (current_cpu == "x64") { 207 } else if (current_cpu == "x64") {
197 android_app_abi = "x86_64" 208 android_app_abi = "x86_64"
198 } else if (current_cpu == "arm64") { 209 } else if (current_cpu == "arm64") {
199 android_app_abi = "arm64-v8a" 210 android_app_abi = "arm64-v8a"
200 } else if (current_cpu == "mips64el") { 211 } else if (current_cpu == "mips64el") {
201 android_app_abi = "mips64" 212 android_app_abi = "mips64"
202 } else { 213 } else {
203 assert(false, "Unknown Android ABI: " + current_cpu) 214 assert(false, "Unknown Android ABI: " + current_cpu)
204 } 215 }
205 } 216 }
OLDNEW
« 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