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

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

Issue 1865853002: Add android_libcpp_lib_dir gn arg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use a single variable Created 4 years, 8 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")
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 if (!defined(webview_framework_jar)) { 43 if (!defined(webview_framework_jar)) {
44 webview_framework_jar = 44 webview_framework_jar =
45 "//third_party/android_platform/webview/frameworks_6.0.jar" 45 "//third_party/android_platform/webview/frameworks_6.0.jar"
46 } 46 }
47 47
48 declare_args() { 48 declare_args() {
49 android_sdk_root = default_android_sdk_root 49 android_sdk_root = default_android_sdk_root
50 android_sdk_version = default_android_sdk_version 50 android_sdk_version = default_android_sdk_version
51 android_sdk_build_tools_version = default_android_sdk_build_tools_version 51 android_sdk_build_tools_version = default_android_sdk_build_tools_version
52 52
53 # Libc++ library directory. Override to use a custom libc++ binary.
54 android_libcpp_lib_dir = ""
55
53 # Android versionCode for android_apk()s that don't expclitly set one. 56 # Android versionCode for android_apk()s that don't expclitly set one.
54 android_default_version_code = "1" 57 android_default_version_code = "1"
55 58
56 # Android versionName for android_apk()s that don't expclitly set one. 59 # Android versionName for android_apk()s that don't expclitly set one.
57 android_default_version_name = "Developer Build" 60 android_default_version_name = "Developer Build"
58 61
59 # The path to the keystore to use for signing builds. 62 # The path to the keystore to use for signing builds.
60 android_keystore_path = default_android_keystore_path 63 android_keystore_path = default_android_keystore_path
61 64
62 # The name of the keystore to use for signing builds. 65 # The name of the keystore to use for signing builds.
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 android_app_secondary_abi = "mips64" 253 android_app_secondary_abi = "mips64"
251 } else if (current_cpu == "x64") { 254 } else if (current_cpu == "x64") {
252 android_app_abi = "x86_64" 255 android_app_abi = "x86_64"
253 } else if (current_cpu == "arm64") { 256 } else if (current_cpu == "arm64") {
254 android_app_abi = "arm64-v8a" 257 android_app_abi = "arm64-v8a"
255 } else if (current_cpu == "mips64el") { 258 } else if (current_cpu == "mips64el") {
256 android_app_abi = "mips64" 259 android_app_abi = "mips64"
257 } else { 260 } else {
258 assert(false, "Unknown Android ABI: " + current_cpu) 261 assert(false, "Unknown Android ABI: " + current_cpu)
259 } 262 }
263
264 if (android_libcpp_lib_dir == "") {
265 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
266 }
260 } 267 }
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