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

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

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/allocator.gni ('k') | build/config/compiler/BUILD.gn » ('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 has_chrome_android_internal = exec_script("//build/dir_exists.py", 8 has_chrome_android_internal = exec_script("//build/dir_exists.py",
9 [ rebase_path("//clank", root_build_dir) ], 9 [ rebase_path("//clank", root_build_dir) ],
10 "string") == "True" 10 "string") == "True"
11 11
12 if (has_chrome_android_internal) { 12 if (has_chrome_android_internal) {
13 import("//clank/config.gni") 13 import("//clank/config.gni")
14 } else { 14 } else {
15 default_android_sdk_root = "//third_party/android_tools/sdk" 15 default_android_sdk_root = "//third_party/android_tools/sdk"
16 default_android_sdk_version = "21" 16 default_android_sdk_version = "21"
17 default_android_sdk_build_tools_version = "21.0.1" 17 default_android_sdk_build_tools_version = "21.0.1"
18 } 18 }
19 19
20 declare_args() { 20 declare_args() {
21 # Absolute directory containing the Android source code.
22 android_src = ""
23
24 android_sdk_root = default_android_sdk_root 21 android_sdk_root = default_android_sdk_root
25 android_sdk_version = default_android_sdk_version 22 android_sdk_version = default_android_sdk_version
26 android_sdk_build_tools_version = default_android_sdk_build_tools_version 23 android_sdk_build_tools_version = default_android_sdk_build_tools_version
27 24
28 # This is set when building the Android WebView inside the Android build 25 # This is set when building the Android WebView inside the Android build
29 # system, using the 'android' gyp backend. The WebView code is still built 26 # system, using the 'android' gyp backend. The WebView code is still built
30 # when this is unset, but builds using the normal chromium build system. 27 # when this is unset, but builds using the normal chromium build system.
31 is_android_webview_build = false 28 is_android_webview_build = false
32 29
33 android_default_keystore_path = "//build/android/ant/chromium-debug.keystore " 30 android_default_keystore_path = "//build/android/ant/chromium-debug.keystore "
34 android_default_keystore_name = "chromiumdebugkey" 31 android_default_keystore_name = "chromiumdebugkey"
35 android_default_keystore_password = "chromium" 32 android_default_keystore_password = "chromium"
36 33
37 # This is a unique identifier for a given build. It's used for 34 # This is a unique identifier for a given build. It's used for
38 # identifying various build artifacts corresponding to a particular build of 35 # identifying various build artifacts corresponding to a particular build of
39 # chrome (e.g. where to find archived symbols). 36 # chrome (e.g. where to find archived symbols).
40 android_chrome_build_id = "\"\"" 37 android_chrome_build_id = "\"\""
41 } 38 }
42 39
43 if (is_android_webview_build) {
44 assert(android_src != "",
45 "You must specify android_src for an Android WebView build.")
46 }
47
48 # Host stuff ----------------------------------------------------------------- 40 # Host stuff -----------------------------------------------------------------
49 41
50 # Defines the name the Android build gives to the current host CPU 42 # Defines the name the Android build gives to the current host CPU
51 # architecture, which is different than the names GN uses. 43 # architecture, which is different than the names GN uses.
52 if (build_cpu_arch == "x64") { 44 if (build_cpu_arch == "x64") {
53 android_host_arch = "x86_64" 45 android_host_arch = "x86_64"
54 } else if (build_cpu_arch == "x86") { 46 } else if (build_cpu_arch == "x86") {
55 android_host_arch = "x86" 47 android_host_arch = "x86"
56 } else { 48 } else {
57 assert(false, "Need Android toolchain support for your build CPU arch.") 49 assert(false, "Need Android toolchain support for your build CPU arch.")
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 } else if (cpu_arch == "mipsel") { 145 } else if (cpu_arch == "mipsel") {
154 android_app_abi = "mips" 146 android_app_abi = "mips"
155 } else { 147 } else {
156 assert(false, "Unknown Android ABI: " + cpu_arch) 148 assert(false, "Unknown Android ABI: " + cpu_arch)
157 } 149 }
158 } else { 150 } else {
159 if (!defined(is_android_webview_build)) { 151 if (!defined(is_android_webview_build)) {
160 is_android_webview_build = false 152 is_android_webview_build = false
161 } 153 }
162 } 154 }
OLDNEW
« no previous file with comments | « build/config/allocator.gni ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698