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

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

Issue 570203002: Make chrome_shell_apk build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome-jamesr
Patch Set: Rebase add chrome_version_java/page_connection_info_javagen Created 6 years, 2 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/android/gyp/write_build_config.py ('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 declare_args() { 8 declare_args() {
9 # Absolute directory containing the Android source code. 9 # Absolute directory containing the Android source code.
10 android_src = "" 10 android_src = ""
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 # Directories and files ------------------------------------------------------ 56 # Directories and files ------------------------------------------------------
57 # 57 #
58 # We define may of the dirs strings here for each output architecture (rather 58 # We define may of the dirs strings here for each output architecture (rather
59 # than just the current one) since these are needed by the Android toolchain 59 # than just the current one) since these are needed by the Android toolchain
60 # file to define toolchains for all possible targets in one pass. 60 # file to define toolchains for all possible targets in one pass.
61 61
62 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" 62 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
63 63
64 # Path to the Android NDK and SDK. 64 # Path to the Android NDK and SDK.
65 android_ndk_root = "//third_party/android_tools/ndk" 65 android_ndk_root = "//third_party/android_tools/ndk"
66 android_ndk_include_dir = "$android_ndk_root/usr/include"
66 67
67 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" 68 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
68 69
69 android_sdk_tools = "${android_sdk_root}/tools" 70 android_sdk_tools = "${android_sdk_root}/tools"
70 android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0" 71 android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0"
71 72
72 # Path to the SDK's android.jar 73 # Path to the SDK's android.jar
73 android_sdk_jar = "$android_sdk/android.jar" 74 android_sdk_jar = "$android_sdk/android.jar"
74 75
75 zipalign_path = "$android_sdk_build_tools/zipalign" 76 zipalign_path = "$android_sdk_build_tools/zipalign"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 android_app_abi = "mips" 144 android_app_abi = "mips"
144 } else { 145 } else {
145 assert(false, "Unknown Android ABI: " + cpu_arch) 146 assert(false, "Unknown Android ABI: " + cpu_arch)
146 } 147 }
147 } else { 148 } else {
148 if (!defined(is_android_webview_build)) { 149 if (!defined(is_android_webview_build)) {
149 is_android_webview_build = false 150 is_android_webview_build = false
150 } 151 }
151 use_system_stlport = false 152 use_system_stlport = false
152 } 153 }
OLDNEW
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698