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

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

Issue 1977723002: [Android] Make android_ndk_root configurable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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")
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)) {
25 default_android_ndk_root = "//third_party/android_tools/ndk"
26 }
27
24 if (!defined(default_android_sdk_root)) { 28 if (!defined(default_android_sdk_root)) {
25 default_android_sdk_root = "//third_party/android_tools/sdk" 29 default_android_sdk_root = "//third_party/android_tools/sdk"
26 default_android_sdk_version = "23" 30 default_android_sdk_version = "23"
27 default_android_sdk_build_tools_version = "23.0.1" 31 default_android_sdk_build_tools_version = "23.0.1"
28 } 32 }
29 33
30 if (!defined(default_android_keystore_path)) { 34 if (!defined(default_android_keystore_path)) {
31 default_android_keystore_path = 35 default_android_keystore_path =
32 "//build/android/ant/chromium-debug.keystore" 36 "//build/android/ant/chromium-debug.keystore"
33 default_android_keystore_name = "chromiumdebugkey" 37 default_android_keystore_name = "chromiumdebugkey"
(...skipping 10 matching lines...) Expand all
44 "//third_party/android_tools:google_play_services_default_resources" 48 "//third_party/android_tools:google_play_services_default_resources"
45 } 49 }
46 50
47 webview_public_framework_jar = 51 webview_public_framework_jar =
48 "//third_party/android_platform/webview/frameworks_6.0.jar" 52 "//third_party/android_platform/webview/frameworks_6.0.jar"
49 if (!defined(webview_framework_jar)) { 53 if (!defined(webview_framework_jar)) {
50 webview_framework_jar = webview_public_framework_jar 54 webview_framework_jar = webview_public_framework_jar
51 } 55 }
52 56
53 declare_args() { 57 declare_args() {
58 android_ndk_root = default_android_ndk_root
59
54 android_sdk_root = default_android_sdk_root 60 android_sdk_root = default_android_sdk_root
55 android_sdk_version = default_android_sdk_version 61 android_sdk_version = default_android_sdk_version
56 android_sdk_build_tools_version = default_android_sdk_build_tools_version 62 android_sdk_build_tools_version = default_android_sdk_build_tools_version
57 63
58 # Libc++ library directory. Override to use a custom libc++ binary. 64 # Libc++ library directory. Override to use a custom libc++ binary.
59 android_libcpp_lib_dir = "" 65 android_libcpp_lib_dir = ""
60 66
61 # Android versionCode for android_apk()s that don't expclitly set one. 67 # Android versionCode for android_apk()s that don't expclitly set one.
62 android_default_version_code = "1" 68 android_default_version_code = "1"
63 69
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 146
141 # Directories and files ------------------------------------------------------ 147 # Directories and files ------------------------------------------------------
142 # 148 #
143 # We define may of the dirs strings here for each output architecture (rather 149 # We define may of the dirs strings here for each output architecture (rather
144 # than just the current one) since these are needed by the Android toolchain 150 # than just the current one) since these are needed by the Android toolchain
145 # file to define toolchains for all possible targets in one pass. 151 # file to define toolchains for all possible targets in one pass.
146 152
147 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" 153 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
148 154
149 # Path to the Android NDK and SDK. 155 # Path to the Android NDK and SDK.
150 android_ndk_root = "//third_party/android_tools/ndk"
151 android_ndk_include_dir = "$android_ndk_root/usr/include" 156 android_ndk_include_dir = "$android_ndk_root/usr/include"
152 157
153 android_sdk_tools = "${android_sdk_root}/tools" 158 android_sdk_tools = "${android_sdk_root}/tools"
154 android_sdk_build_tools = 159 android_sdk_build_tools =
155 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" 160 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
156 161
157 # Path to the SDK's android.jar 162 # Path to the SDK's android.jar
158 android_sdk_jar = "$android_sdk/android.jar" 163 android_sdk_jar = "$android_sdk/android.jar"
159 164
160 zipalign_path = "$android_sdk_build_tools/zipalign" 165 zipalign_path = "$android_sdk_build_tools/zipalign"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 } else if (current_cpu == "mips64el") { 263 } else if (current_cpu == "mips64el") {
259 android_app_abi = "mips64" 264 android_app_abi = "mips64"
260 } else { 265 } else {
261 assert(false, "Unknown Android ABI: " + current_cpu) 266 assert(false, "Unknown Android ABI: " + current_cpu)
262 } 267 }
263 268
264 if (android_libcpp_lib_dir == "") { 269 if (android_libcpp_lib_dir == "") {
265 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" 270 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
266 } 271 }
267 } 272 }
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