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

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

Issue 951983002: Reland "Enable libc++ on Android" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final rebase 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
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } else { 152 } else {
153 assert(false, "Need android libgcc support for your target arch.") 153 assert(false, "Need android libgcc support for your target arch.")
154 } 154 }
155 155
156 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-" 156 android_tool_prefix = "$android_toolchain_root/bin/$_binary_prefix-"
157 android_readelf = "${android_tool_prefix}readelf" 157 android_readelf = "${android_tool_prefix}readelf"
158 android_objcopy = "${android_tool_prefix}objcopy" 158 android_objcopy = "${android_tool_prefix}objcopy"
159 android_gdbserver = 159 android_gdbserver =
160 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver" 160 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
161 161
162 # stlport stuff --------------------------------------------------------------
163
164 if (component_mode == "shared_library") {
165 android_stlport_library = "stlport_shared"
166 } else {
167 android_stlport_library = "stlport_static"
168 }
169
170 # ABI ------------------------------------------------------------------------ 162 # ABI ------------------------------------------------------------------------
171 163
172 if (current_cpu == "x86") { 164 if (current_cpu == "x86") {
173 android_app_abi = "x86" 165 android_app_abi = "x86"
174 } else if (current_cpu == "arm") { 166 } else if (current_cpu == "arm") {
175 import("//build/config/arm.gni") 167 import("//build/config/arm.gni")
176 if (arm_version < 7) { 168 if (arm_version < 7) {
177 android_app_abi = "armeabi" 169 android_app_abi = "armeabi"
178 } else { 170 } else {
179 android_app_abi = "armeabi-v7a" 171 android_app_abi = "armeabi-v7a"
180 } 172 }
181 } else if (current_cpu == "mipsel") { 173 } else if (current_cpu == "mipsel") {
182 android_app_abi = "mips" 174 android_app_abi = "mips"
183 } else if (current_cpu == "x64") { 175 } else if (current_cpu == "x64") {
184 android_app_abi = "x86_64" 176 android_app_abi = "x86_64"
185 } else if (current_cpu == "arm64") { 177 } else if (current_cpu == "arm64") {
186 android_app_abi = "arm64-v8a" 178 android_app_abi = "arm64-v8a"
187 } else if (current_cpu == "mips64el") { 179 } else if (current_cpu == "mips64el") {
188 android_app_abi = "mips64" 180 android_app_abi = "mips64"
189 } else { 181 } else {
190 assert(false, "Unknown Android ABI: " + current_cpu) 182 assert(false, "Unknown Android ABI: " + current_cpu)
191 } 183 }
192 } else { 184 } else {
193 if (!defined(is_android_webview_build)) { 185 if (!defined(is_android_webview_build)) {
194 is_android_webview_build = false 186 is_android_webview_build = false
195 } 187 }
196 } 188 }
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698