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

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

Issue 2596873002: [Android] Support compiling with NDK r13b. (Closed)
Patch Set: Created 4 years 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') | tools/mb/mb_config.pyl » ('j') | 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 import("//build_overrides/build.gni") 8 import("//build_overrides/build.gni")
9 9
10 has_chrome_android_internal = 10 has_chrome_android_internal =
11 exec_script("//build/dir_exists.py", 11 exec_script("//build/dir_exists.py",
12 [ rebase_path("//clank", root_build_dir) ], 12 [ rebase_path("//clank", root_build_dir) ],
13 "string") == "True" 13 "string") == "True"
14 14
15 if (has_chrome_android_internal) { 15 if (has_chrome_android_internal) {
16 import("//clank/config.gni") 16 import("//clank/config.gni")
17 } 17 }
18 18
19 if (!defined(extra_chrome_shared_library_configs)) { 19 if (!defined(extra_chrome_shared_library_configs)) {
20 extra_chrome_shared_library_configs = [] 20 extra_chrome_shared_library_configs = []
21 } 21 }
22 22
23 if (!defined(default_android_ndk_root)) { 23 if (!defined(default_android_ndk_root)) {
24 default_android_ndk_root = "//third_party/android_tools/ndk" 24 default_android_ndk_root = "//third_party/android_tools/ndk"
25 default_android_ndk_version = "r12b" 25 default_android_ndk_version = "r12b"
26 default_android_ndk_major_version = "12" 26 default_android_ndk_major_version = 12
27 } else { 27 } else {
28 assert(defined(default_android_ndk_version)) 28 assert(defined(default_android_ndk_version))
29 assert(defined(default_android_ndk_major_version)) 29 assert(defined(default_android_ndk_major_version))
30 } 30 }
31 31
32 if (!defined(default_android_sdk_root)) { 32 if (!defined(default_android_sdk_root)) {
33 default_android_sdk_root = "//third_party/android_tools/sdk" 33 default_android_sdk_root = "//third_party/android_tools/sdk"
34 default_android_sdk_version = "24" 34 default_android_sdk_version = "24"
35 default_android_sdk_build_tools_version = "24.0.2" 35 default_android_sdk_build_tools_version = "24.0.2"
36 } 36 }
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 "//build/toolchain/android:android_${android_secondary_abi_cpu}" 345 "//build/toolchain/android:android_${android_secondary_abi_cpu}"
346 } 346 }
347 } 347 }
348 } 348 }
349 349
350 declare_args() { 350 declare_args() {
351 # Enables used resource whitelist generation. Set for official builds only 351 # Enables used resource whitelist generation. Set for official builds only
352 # as a large amount of build output is generated. 352 # as a large amount of build output is generated.
353 enable_resource_whitelist_generation = is_android && is_official_build 353 enable_resource_whitelist_generation = is_android && is_official_build
354 } 354 }
OLDNEW
« no previous file with comments | « build/config/android/BUILD.gn ('k') | tools/mb/mb_config.pyl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698