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

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

Issue 1991343002: [Android] Roll the NDK to r11c. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 2 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
« no previous file with comments | « build/config/android/BUILD.gn ('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 } 27 }
27 28
28 if (!defined(default_android_sdk_root)) { 29 if (!defined(default_android_sdk_root)) {
29 default_android_sdk_root = "//third_party/android_tools/sdk" 30 default_android_sdk_root = "//third_party/android_tools/sdk"
30 default_android_sdk_version = "23" 31 default_android_sdk_version = "23"
31 default_android_sdk_build_tools_version = "23.0.1" 32 default_android_sdk_build_tools_version = "23.0.1"
32 } 33 }
33 34
34 if (!defined(default_android_keystore_path)) { 35 if (!defined(default_android_keystore_path)) {
35 default_android_keystore_path = 36 default_android_keystore_path =
(...skipping 13 matching lines...) Expand all
49 } 50 }
50 51
51 webview_public_framework_jar = 52 webview_public_framework_jar =
52 "//third_party/android_platform/webview/frameworks_6.0.jar" 53 "//third_party/android_platform/webview/frameworks_6.0.jar"
53 if (!defined(webview_framework_jar)) { 54 if (!defined(webview_framework_jar)) {
54 webview_framework_jar = webview_public_framework_jar 55 webview_framework_jar = webview_public_framework_jar
55 } 56 }
56 57
57 declare_args() { 58 declare_args() {
58 android_ndk_root = default_android_ndk_root 59 android_ndk_root = default_android_ndk_root
60 android_ndk_version = default_android_ndk_version
59 61
60 android_sdk_root = default_android_sdk_root 62 android_sdk_root = default_android_sdk_root
61 android_sdk_version = default_android_sdk_version 63 android_sdk_version = default_android_sdk_version
62 android_sdk_build_tools_version = default_android_sdk_build_tools_version 64 android_sdk_build_tools_version = default_android_sdk_build_tools_version
63 65
64 # Libc++ library directory. Override to use a custom libc++ binary. 66 # Libc++ library directory. Override to use a custom libc++ binary.
65 android_libcpp_lib_dir = "" 67 android_libcpp_lib_dir = ""
66 68
67 # Android versionCode for android_apk()s that don't expclitly set one. 69 # Android versionCode for android_apk()s that don't expclitly set one.
68 android_default_version_code = "1" 70 android_default_version_code = "1"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 } else if (current_cpu == "mips64el") { 265 } else if (current_cpu == "mips64el") {
264 android_app_abi = "mips64" 266 android_app_abi = "mips64"
265 } else { 267 } else {
266 assert(false, "Unknown Android ABI: " + current_cpu) 268 assert(false, "Unknown Android ABI: " + current_cpu)
267 } 269 }
268 270
269 if (android_libcpp_lib_dir == "") { 271 if (android_libcpp_lib_dir == "") {
270 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" 272 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
271 } 273 }
272 } 274 }
OLDNEW
« no previous file with comments | « build/config/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698