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

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

Issue 157273002: GN: Remove android arguments from the conditional (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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
7 # TODO(brettw) bug 341772 put this into the is_android block when the toolchain
8 # stuff is fixed in the GYP generator. The problem is that when we redo the
9 # build in host mode, the OS is not android and the declarations are never
10 # seen, which throws an error because these arguments are specified.
11 declare_args() {
12 android_src = ""
13
14 # This is set when building the Android WebView inside the Android build
15 # system, using the 'android' gyp backend. The WebView code is still built
16 # when this is unset, but builds using the normal chromium build system.
17 is_android_webview_build = false
18 }
19
6 if (is_android) { 20 if (is_android) {
7 declare_args() {
8 android_src = ""
9
10 # This is set when building the Android WebView inside the Android build
11 # system, using the 'android' gyp backend. The WebView code is still built
12 # when this is unset, but builds using the normal chromium build system.
13 is_android_webview_build = false
14 }
15
16 if (is_android_webview_build) { 21 if (is_android_webview_build) {
17 assert(android_src != "", 22 assert(android_src != "",
18 "You must specify android_src for an Android WebView build.") 23 "You must specify android_src for an Android WebView build.")
19 } 24 }
20 25
21 # android_ndk_root ----------------------------------------------------------- 26 # android_ndk_root -----------------------------------------------------------
22 27
23 # Full system path to the Android NDK. 28 # Full system path to the Android NDK.
24 android_ndk_root = 29 android_ndk_root =
25 rebase_path("//third_party/android_tools/ndk", ".", "") 30 rebase_path("//third_party/android_tools/ndk", ".", "")
(...skipping 25 matching lines...) Expand all
51 android_app_abi = "mips" 56 android_app_abi = "mips"
52 } else { 57 } else {
53 assert(false, "Unknown Android ABI") 58 assert(false, "Unknown Android ABI")
54 } 59 }
55 } else { 60 } else {
56 if (!defined(is_android_webview_build)) { 61 if (!defined(is_android_webview_build)) {
57 is_android_webview_build = false 62 is_android_webview_build = false
58 } 63 }
59 use_system_stlport = false 64 use_system_stlport = false
60 } 65 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698