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

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

Issue 787803004: Update from https://crrev.com/307664 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase. Created 6 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/common.gypi ('k') | build/config/android/internal_rules.gni » ('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 = 8 has_chrome_android_internal =
9 exec_script("//build/dir_exists.py", 9 exec_script("//build/dir_exists.py",
10 [ rebase_path("//clank", root_build_dir) ], 10 [ rebase_path("//clank", root_build_dir) ],
11 "string") == "True" 11 "string") == "True"
12 12
13 if (has_chrome_android_internal) { 13 if (has_chrome_android_internal) {
14 import("//clank/config.gni") 14 import("//clank/config.gni")
15 } else { 15 }
16
17 if (!defined(default_android_sdk_root)) {
16 default_android_sdk_root = "//third_party/android_tools/sdk" 18 default_android_sdk_root = "//third_party/android_tools/sdk"
17 default_android_sdk_version = "21" 19 default_android_sdk_version = "21"
18 default_android_sdk_build_tools_version = "21.0.1" 20 default_android_sdk_build_tools_version = "21.0.1"
19 } 21 }
20 22
21 declare_args() { 23 declare_args() {
22 android_sdk_root = default_android_sdk_root 24 android_sdk_root = default_android_sdk_root
23 android_sdk_version = default_android_sdk_version 25 android_sdk_version = default_android_sdk_version
24 android_sdk_build_tools_version = default_android_sdk_build_tools_version 26 android_sdk_build_tools_version = default_android_sdk_build_tools_version
25 27
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } else if (cpu_arch == "mipsel") { 151 } else if (cpu_arch == "mipsel") {
150 android_app_abi = "mips" 152 android_app_abi = "mips"
151 } else { 153 } else {
152 assert(false, "Unknown Android ABI: " + cpu_arch) 154 assert(false, "Unknown Android ABI: " + cpu_arch)
153 } 155 }
154 } else { 156 } else {
155 if (!defined(is_android_webview_build)) { 157 if (!defined(is_android_webview_build)) {
156 is_android_webview_build = false 158 is_android_webview_build = false
157 } 159 }
158 } 160 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698