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

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

Issue 2040043002: [Android] Revert the NDK back to r10e. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: twellington comment Created 4 years, 6 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
« build/common.gypi ('K') | « build/common.gypi ('k') | 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")
11 has_chrome_android_internal = 11 has_chrome_android_internal =
12 exec_script("//build/dir_exists.py", 12 exec_script("//build/dir_exists.py",
13 [ rebase_path("//clank", root_build_dir) ], 13 [ rebase_path("//clank", root_build_dir) ],
14 "string") == "True" 14 "string") == "True"
15 15
16 if (has_chrome_android_internal) { 16 if (has_chrome_android_internal) {
17 import("//clank/config.gni") 17 import("//clank/config.gni")
18 } 18 }
19 19
20 if (!defined(extra_chrome_shared_library_configs)) { 20 if (!defined(extra_chrome_shared_library_configs)) {
21 extra_chrome_shared_library_configs = [] 21 extra_chrome_shared_library_configs = []
22 } 22 }
23 23
24 if (!defined(default_android_ndk_root)) { 24 if (!defined(default_android_ndk_root)) {
25 default_android_ndk_root = "//third_party/android_tools/ndk" 25 default_android_ndk_root = "//third_party/android_tools/ndk"
26 default_android_ndk_version = "r11c" 26 default_android_ndk_version = "r10e"
27 } 27 }
28 28
29 if (!defined(default_android_sdk_root)) { 29 if (!defined(default_android_sdk_root)) {
30 default_android_sdk_root = "//third_party/android_tools/sdk" 30 default_android_sdk_root = "//third_party/android_tools/sdk"
31 default_android_sdk_version = "23" 31 default_android_sdk_version = "23"
32 default_android_sdk_build_tools_version = "23.0.1" 32 default_android_sdk_build_tools_version = "23.0.1"
33 } 33 }
34 34
35 if (!defined(default_android_keystore_path)) { 35 if (!defined(default_android_keystore_path)) {
36 default_android_keystore_path = 36 default_android_keystore_path =
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 } else if (current_cpu == "mips64el") { 265 } else if (current_cpu == "mips64el") {
266 android_app_abi = "mips64" 266 android_app_abi = "mips64"
267 } else { 267 } else {
268 assert(false, "Unknown Android ABI: " + current_cpu) 268 assert(false, "Unknown Android ABI: " + current_cpu)
269 } 269 }
270 270
271 if (android_libcpp_lib_dir == "") { 271 if (android_libcpp_lib_dir == "") {
272 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" 272 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
273 } 273 }
274 } 274 }
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698