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

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

Issue 2297273002: Reorder default_android_ndk_major_version declarations. (Closed)
Patch Set: Created 4 years, 3 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 11
12 import("//build_overrides/build.gni") 12 import("//build_overrides/build.gni")
13 13
14 has_chrome_android_internal = 14 has_chrome_android_internal =
15 exec_script("//build/dir_exists.py", 15 exec_script("//build/dir_exists.py",
16 [ rebase_path("//clank", root_build_dir) ], 16 [ rebase_path("//clank", root_build_dir) ],
17 "string") == "True" 17 "string") == "True"
18 18
19 if (has_chrome_android_internal) { 19 if (has_chrome_android_internal) {
20 import("//clank/config.gni") 20 import("//clank/config.gni")
21 } 21 }
22 22
23 if (!defined(extra_chrome_shared_library_configs)) { 23 if (!defined(extra_chrome_shared_library_configs)) {
24 extra_chrome_shared_library_configs = [] 24 extra_chrome_shared_library_configs = []
25 } 25 }
26 26
27 if (!defined(default_android_ndk_root)) { 27 if (!defined(default_android_ndk_root)) {
28 default_android_ndk_major_version = "10"
29 default_android_ndk_root = "//third_party/android_tools/ndk" 28 default_android_ndk_root = "//third_party/android_tools/ndk"
30 default_android_ndk_version = "r10e" 29 default_android_ndk_version = "r10e"
30 default_android_ndk_major_version = "10"
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 } 34 }
34 35
35 # The same version of lint should be used for building all targets, 36 # The same version of lint should be used for building all targets,
36 # and these args ensure that the upstream version of lint is used for 37 # and these args ensure that the upstream version of lint is used for
37 # both upstream and downstream targets. 38 # both upstream and downstream targets.
38 lint_android_sdk_root = "//third_party/android_tools/sdk" 39 lint_android_sdk_root = "//third_party/android_tools/sdk"
39 lint_android_sdk_version = "23" 40 lint_android_sdk_version = "23"
40 41
41 if (!defined(default_android_sdk_root)) { 42 if (!defined(default_android_sdk_root)) {
42 # Reuse the lint variables to ensure that the lint version gets updated 43 # Reuse the lint variables to ensure that the lint version gets updated
(...skipping 20 matching lines...) Expand all
63 "//third_party/android_tools:google_play_services_default_resources" 64 "//third_party/android_tools:google_play_services_default_resources"
64 } 65 }
65 66
66 webview_public_framework_jar = 67 webview_public_framework_jar =
67 "//third_party/android_platform/webview/frameworks_6.0.jar" 68 "//third_party/android_platform/webview/frameworks_6.0.jar"
68 if (!defined(webview_framework_jar)) { 69 if (!defined(webview_framework_jar)) {
69 webview_framework_jar = webview_public_framework_jar 70 webview_framework_jar = webview_public_framework_jar
70 } 71 }
71 72
72 declare_args() { 73 declare_args() {
73 android_ndk_major_version = default_android_ndk_major_version
74 android_ndk_root = default_android_ndk_root 74 android_ndk_root = default_android_ndk_root
75 android_ndk_version = default_android_ndk_version 75 android_ndk_version = default_android_ndk_version
76 android_ndk_major_version = default_android_ndk_major_version
76 77
77 android_sdk_root = default_android_sdk_root 78 android_sdk_root = default_android_sdk_root
78 android_sdk_version = default_android_sdk_version 79 android_sdk_version = default_android_sdk_version
79 android_sdk_build_tools_version = default_android_sdk_build_tools_version 80 android_sdk_build_tools_version = default_android_sdk_build_tools_version
80 81
81 # Libc++ library directory. Override to use a custom libc++ binary. 82 # Libc++ library directory. Override to use a custom libc++ binary.
82 android_libcpp_lib_dir = "" 83 android_libcpp_lib_dir = ""
83 84
84 # Android versionCode for android_apk()s that don't expclitly set one. 85 # Android versionCode for android_apk()s that don't expclitly set one.
85 android_default_version_code = "1" 86 android_default_version_code = "1"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 "//build/toolchain/android:${android_secondary_abi_cpu}" 323 "//build/toolchain/android:${android_secondary_abi_cpu}"
323 } 324 }
324 } 325 }
325 } 326 }
326 327
327 declare_args() { 328 declare_args() {
328 # Enables used resource whitelist generation. Set for official builds only 329 # Enables used resource whitelist generation. Set for official builds only
329 # as a large amount of build output is generated. 330 # as a large amount of build output is generated.
330 enable_resource_whitelist_generation = is_android && is_official_build 331 enable_resource_whitelist_generation = is_android && is_official_build
331 } 332 }
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