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

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

Issue 1043913002: Remove most android_webview_build conditions from build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and rebase Created 5 years, 8 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 | « build/common.gypi ('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 = 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) ],
(...skipping 12 matching lines...) Expand all
23 if (!defined(google_play_services_library)) { 23 if (!defined(google_play_services_library)) {
24 google_play_services_library = 24 google_play_services_library =
25 "//third_party/android_tools:google_play_services_default_java" 25 "//third_party/android_tools:google_play_services_default_java"
26 } 26 }
27 27
28 declare_args() { 28 declare_args() {
29 android_sdk_root = default_android_sdk_root 29 android_sdk_root = default_android_sdk_root
30 android_sdk_version = default_android_sdk_version 30 android_sdk_version = default_android_sdk_version
31 android_sdk_build_tools_version = default_android_sdk_build_tools_version 31 android_sdk_build_tools_version = default_android_sdk_build_tools_version
32 32
33 # This is set when building the Android WebView inside the Android build 33 # WebView now builds in a normal android build; don't use this.
34 # system, using the 'android' gyp backend. The WebView code is still built 34 # TODO(torne): remove this. http://crbug.com/440793
35 # when this is unset, but builds using the normal chromium build system.
36 is_android_webview_build = false 35 is_android_webview_build = false
37 36
38 android_default_keystore_path = 37 android_default_keystore_path =
39 "//build/android/ant/chromium-debug.keystore" 38 "//build/android/ant/chromium-debug.keystore"
40 android_default_keystore_name = "chromiumdebugkey" 39 android_default_keystore_name = "chromiumdebugkey"
41 android_default_keystore_password = "chromium" 40 android_default_keystore_password = "chromium"
42 41
43 # This is a unique identifier for a given build. It's used for 42 # This is a unique identifier for a given build. It's used for
44 # identifying various build artifacts corresponding to a particular build of 43 # identifying various build artifacts corresponding to a particular build of
45 # chrome (e.g. where to find archived symbols). 44 # chrome (e.g. where to find archived symbols).
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 } else if (current_cpu == "mips64el") { 189 } else if (current_cpu == "mips64el") {
191 android_app_abi = "mips64" 190 android_app_abi = "mips64"
192 } else { 191 } else {
193 assert(false, "Unknown Android ABI: " + current_cpu) 192 assert(false, "Unknown Android ABI: " + current_cpu)
194 } 193 }
195 } else { 194 } else {
196 if (!defined(is_android_webview_build)) { 195 if (!defined(is_android_webview_build)) {
197 is_android_webview_build = false 196 is_android_webview_build = false
198 } 197 }
199 } 198 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698