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

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

Issue 2438913004: Revert of [Reland] Upgrade to new Android SDK. (Closed)
Patch Set: Created 4 years, 2 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 | « build/android/pylib/constants/__init__.py ('k') | components/cronet/android/api/build.xml » ('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 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 17 matching lines...) Expand all
28 default_android_ndk_root = "//third_party/android_tools/ndk" 28 default_android_ndk_root = "//third_party/android_tools/ndk"
29 default_android_ndk_version = "r12b" 29 default_android_ndk_version = "r12b"
30 default_android_ndk_major_version = "12" 30 default_android_ndk_major_version = "12"
31 } else { 31 } else {
32 assert(defined(default_android_ndk_version)) 32 assert(defined(default_android_ndk_version))
33 assert(defined(default_android_ndk_major_version)) 33 assert(defined(default_android_ndk_major_version))
34 } 34 }
35 35
36 if (!defined(default_android_sdk_root)) { 36 if (!defined(default_android_sdk_root)) {
37 default_android_sdk_root = "//third_party/android_tools/sdk" 37 default_android_sdk_root = "//third_party/android_tools/sdk"
38 default_android_sdk_version = "24" 38 default_android_sdk_version = "23"
39 default_android_sdk_build_tools_version = "24.0.2" 39 default_android_sdk_build_tools_version = "23.0.1"
40 } 40 }
41 41
42 if (!defined(default_lint_android_sdk_root)) { 42 if (!defined(default_lint_android_sdk_root)) {
43 # Purposefully repeated so that downstream can change 43 # Purposefully repeated so that downstream can change
44 # default_android_sdk_root without changing lint version. 44 # default_android_sdk_root without changing lint version.
45 default_lint_android_sdk_root = "//third_party/android_tools/sdk" 45 default_lint_android_sdk_root = "//third_party/android_tools/sdk"
46 default_lint_android_sdk_version = "23" 46 default_lint_android_sdk_version = "23"
47 } 47 }
48 48
49 if (!defined(default_android_keystore_path)) { 49 if (!defined(default_android_keystore_path)) {
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 "//build/toolchain/android:${android_secondary_abi_cpu}" 333 "//build/toolchain/android:${android_secondary_abi_cpu}"
334 } 334 }
335 } 335 }
336 } 336 }
337 337
338 declare_args() { 338 declare_args() {
339 # Enables used resource whitelist generation. Set for official builds only 339 # Enables used resource whitelist generation. Set for official builds only
340 # as a large amount of build output is generated. 340 # as a large amount of build output is generated.
341 enable_resource_whitelist_generation = is_android && is_official_build 341 enable_resource_whitelist_generation = is_android && is_official_build
342 } 342 }
OLDNEW
« no previous file with comments | « build/android/pylib/constants/__init__.py ('k') | components/cronet/android/api/build.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698