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

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

Issue 1828523002: Support packaging secondary abi native libraries in APK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 assert(rebase_path("//", root_build_dir) == "../../", 8 assert(rebase_path("//", root_build_dir) == "../../",
9 "Android output directory must be nested 2 levels within src/ (" + 9 "Android output directory must be nested 2 levels within src/ (" +
10 "e.g.: out-gn/Debug). http://crbug.com/412935") 10 "e.g.: out-gn/Debug). http://crbug.com/412935")
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 android_objcopy = "${android_tool_prefix}objcopy" 225 android_objcopy = "${android_tool_prefix}objcopy"
226 android_gdbserver = 226 android_gdbserver =
227 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver" 227 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
228 228
229 # Toolchain stuff ------------------------------------------------------------ 229 # Toolchain stuff ------------------------------------------------------------
230 230
231 android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++" 231 android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++"
232 232
233 # ABI ------------------------------------------------------------------------ 233 # ABI ------------------------------------------------------------------------
234 234
235 # Intentionally not define android_app_secondary_abi for 64-bit
agrieve 2016/03/23 18:11:19 nit: "Intentionally not define" -> "Intentionally
michaelbai 2016/03/23 18:55:33 Done.
236 # android_app_abi, since they are not used.
235 if (current_cpu == "x86") { 237 if (current_cpu == "x86") {
236 android_app_abi = "x86" 238 android_app_abi = "x86"
239 android_app_secondary_abi = "x86_64"
237 } else if (current_cpu == "arm") { 240 } else if (current_cpu == "arm") {
238 import("//build/config/arm.gni") 241 import("//build/config/arm.gni")
239 if (arm_version < 7) { 242 if (arm_version < 7) {
240 android_app_abi = "armeabi" 243 android_app_abi = "armeabi"
241 } else { 244 } else {
242 android_app_abi = "armeabi-v7a" 245 android_app_abi = "armeabi-v7a"
243 } 246 }
247 android_app_secondary_abi = "arm64-v8a"
244 } else if (current_cpu == "mipsel") { 248 } else if (current_cpu == "mipsel") {
245 android_app_abi = "mips" 249 android_app_abi = "mips"
250 android_app_secondary_abi = "mips64"
246 } else if (current_cpu == "x64") { 251 } else if (current_cpu == "x64") {
247 android_app_abi = "x86_64" 252 android_app_abi = "x86_64"
248 } else if (current_cpu == "arm64") { 253 } else if (current_cpu == "arm64") {
249 android_app_abi = "arm64-v8a" 254 android_app_abi = "arm64-v8a"
250 } else if (current_cpu == "mips64el") { 255 } else if (current_cpu == "mips64el") {
251 android_app_abi = "mips64" 256 android_app_abi = "mips64"
252 } else { 257 } else {
253 assert(false, "Unknown Android ABI: " + current_cpu) 258 assert(false, "Unknown Android ABI: " + current_cpu)
254 } 259 }
255 } 260 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698