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

Side by Side Diff: build/config/android/config.gni

Issue 2294823002: Remove lint variables from SDK version and path. (Closed)
Patch Set: Created 4 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 | no next file » | 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 assert(rebase_path("//", root_build_dir) == "../../", 8 assert(rebase_path("//", root_build_dir) == "../../",
9 "Android output directory must be nested 2 levels within src/ (" + 9 "Android output directory must be nested 2 levels within src/ (" +
10 "e.g.: out-gn/Debug). http://crbug.com/412935") 10 "e.g.: out-gn/Debug). http://crbug.com/412935")
(...skipping 21 matching lines...) Expand all
32 assert(defined(default_android_ndk_version)) 32 assert(defined(default_android_ndk_version))
33 } 33 }
34 34
35 # The same version of lint should be used for building all targets, 35 # The same version of lint should be used for building all targets,
36 # and these args ensure that the upstream version of lint is used for 36 # and these args ensure that the upstream version of lint is used for
37 # both upstream and downstream targets. 37 # both upstream and downstream targets.
38 lint_android_sdk_root = "//third_party/android_tools/sdk" 38 lint_android_sdk_root = "//third_party/android_tools/sdk"
39 lint_android_sdk_version = "23" 39 lint_android_sdk_version = "23"
40 40
41 if (!defined(default_android_sdk_root)) { 41 if (!defined(default_android_sdk_root)) {
42 # Reuse the lint variables to ensure that the lint version gets updated 42 default_android_sdk_root = "//third_party/android_tools/sdk"
jbudorick 2016/08/30 15:49:10 This seems odd too. Why are lint_android_sdk_root
estevenson 2016/08/30 16:43:51 Because the defaults below can be set in other pla
jbudorick 2016/08/31 18:53:19 I think I'd prefer a downstream change. Having a h
estevenson 2016/08/31 20:41:01 Done.
43 # when the upstream SDK version is updated. 43 default_android_sdk_version = "23"
44 default_android_sdk_root = lint_android_sdk_root
45 default_android_sdk_version = lint_android_sdk_version
46 default_android_sdk_build_tools_version = "23.0.1" 44 default_android_sdk_build_tools_version = "23.0.1"
47 } 45 }
48 46
49 if (!defined(default_android_keystore_path)) { 47 if (!defined(default_android_keystore_path)) {
50 default_android_keystore_path = 48 default_android_keystore_path =
51 "//build/android/ant/chromium-debug.keystore" 49 "//build/android/ant/chromium-debug.keystore"
52 default_android_keystore_name = "chromiumdebugkey" 50 default_android_keystore_name = "chromiumdebugkey"
53 default_android_keystore_password = "chromium" 51 default_android_keystore_password = "chromium"
54 } 52 }
55 53
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 "//build/toolchain/android:${android_secondary_abi_cpu}" 320 "//build/toolchain/android:${android_secondary_abi_cpu}"
323 } 321 }
324 } 322 }
325 } 323 }
326 324
327 declare_args() { 325 declare_args() {
328 # Enables used resource whitelist generation. Set for official builds only 326 # Enables used resource whitelist generation. Set for official builds only
329 # as a large amount of build output is generated. 327 # as a large amount of build output is generated.
330 enable_resource_whitelist_generation = is_android && is_official_build 328 enable_resource_whitelist_generation = is_android && is_official_build
331 } 329 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698