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

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

Issue 865733002: Make Chrome for Android dependent on Google Play Services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits Created 5 years, 10 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 | build/secondary/third_party/android_tools/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 = 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 } 15 }
16 16
17 if (!defined(default_android_sdk_root)) { 17 if (!defined(default_android_sdk_root)) {
18 default_android_sdk_root = "//third_party/android_tools/sdk" 18 default_android_sdk_root = "//third_party/android_tools/sdk"
19 default_android_sdk_version = "21" 19 default_android_sdk_version = "21"
20 default_android_sdk_build_tools_version = "21.0.1" 20 default_android_sdk_build_tools_version = "21.0.1"
21 } 21 }
22 22
23 if (!defined(google_play_services_library)) {
24 google_play_services_library =
25 "//third_party/android_tools:google_play_services_default_java"
26 }
27
23 declare_args() { 28 declare_args() {
24 android_sdk_root = default_android_sdk_root 29 android_sdk_root = default_android_sdk_root
25 android_sdk_version = default_android_sdk_version 30 android_sdk_version = default_android_sdk_version
26 android_sdk_build_tools_version = default_android_sdk_build_tools_version 31 android_sdk_build_tools_version = default_android_sdk_build_tools_version
27 32
28 # This is set when building the Android WebView inside the Android build 33 # 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 34 # 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. 35 # when this is unset, but builds using the normal chromium build system.
31 is_android_webview_build = false 36 is_android_webview_build = false
32 37
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } else if (cpu_arch == "mipsel") { 156 } else if (cpu_arch == "mipsel") {
152 android_app_abi = "mips" 157 android_app_abi = "mips"
153 } else { 158 } else {
154 assert(false, "Unknown Android ABI: " + cpu_arch) 159 assert(false, "Unknown Android ABI: " + cpu_arch)
155 } 160 }
156 } else { 161 } else {
157 if (!defined(is_android_webview_build)) { 162 if (!defined(is_android_webview_build)) {
158 is_android_webview_build = false 163 is_android_webview_build = false
159 } 164 }
160 } 165 }
OLDNEW
« no previous file with comments | « no previous file | build/secondary/third_party/android_tools/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698