Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 import("//build/config/android/secondary_abi.gni") | |
|
agrieve
2016/07/20 02:11:03
Having this as a separate file doesn't really make
michaelbai
2016/07/20 16:51:10
It was used in more than one place, moved into thi
| |
| 8 | |
| 7 if (is_android) { | 9 if (is_android) { |
| 8 assert(rebase_path("//", root_build_dir) == "../../", | 10 assert(rebase_path("//", root_build_dir) == "../../", |
| 9 "Android output directory must be nested 2 levels within src/ (" + | 11 "Android output directory must be nested 2 levels within src/ (" + |
| 10 "e.g.: out-gn/Debug). http://crbug.com/412935") | 12 "e.g.: out-gn/Debug). http://crbug.com/412935") |
| 11 | 13 |
| 12 import("//build_overrides/build.gni") | 14 import("//build_overrides/build.gni") |
| 13 | 15 |
| 14 has_chrome_android_internal = | 16 has_chrome_android_internal = |
| 15 exec_script("//build/dir_exists.py", | 17 exec_script("//build/dir_exists.py", |
| 16 [ rebase_path("//clank", root_build_dir) ], | 18 [ rebase_path("//clank", root_build_dir) ], |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 259 android_objcopy = "${android_tool_prefix}objcopy" | 261 android_objcopy = "${android_tool_prefix}objcopy" |
| 260 android_gdbserver = | 262 android_gdbserver = |
| 261 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver" | 263 "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver" |
| 262 | 264 |
| 263 # Toolchain stuff ------------------------------------------------------------ | 265 # Toolchain stuff ------------------------------------------------------------ |
| 264 | 266 |
| 265 android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++" | 267 android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++" |
| 266 | 268 |
| 267 # ABI ------------------------------------------------------------------------ | 269 # ABI ------------------------------------------------------------------------ |
| 268 | 270 |
| 269 # Intentionally do not define android_app_secondary_abi for 64-bit | 271 # Intentionally do not define android_app_secondary_abi for 32-bit |
| 270 # android_app_abi, since they are not used. | 272 # android_app_abi, since they are not used. |
| 271 if (current_cpu == "x86") { | 273 if (current_cpu == "x86") { |
| 272 android_app_abi = "x86" | 274 android_app_abi = "x86" |
| 273 android_app_secondary_abi = "x86_64" | |
| 274 } else if (current_cpu == "arm") { | 275 } else if (current_cpu == "arm") { |
| 275 import("//build/config/arm.gni") | 276 import("//build/config/arm.gni") |
| 276 if (arm_version < 7) { | 277 if (arm_version < 7) { |
| 277 android_app_abi = "armeabi" | 278 android_app_abi = "armeabi" |
| 278 } else { | 279 } else { |
| 279 android_app_abi = "armeabi-v7a" | 280 android_app_abi = "armeabi-v7a" |
| 280 } | 281 } |
| 281 android_app_secondary_abi = "arm64-v8a" | |
| 282 } else if (current_cpu == "mipsel") { | 282 } else if (current_cpu == "mipsel") { |
| 283 android_app_abi = "mips" | 283 android_app_abi = "mips" |
| 284 android_app_secondary_abi = "mips64" | |
| 285 } else if (current_cpu == "x64") { | 284 } else if (current_cpu == "x64") { |
| 286 android_app_abi = "x86_64" | 285 android_app_abi = "x86_64" |
| 286 android_app_secondary_abi = "x86" | |
|
agrieve
2016/07/20 02:11:03
If we're going to have a separate file for seconda
| |
| 287 } else if (current_cpu == "arm64") { | 287 } else if (current_cpu == "arm64") { |
| 288 android_app_abi = "arm64-v8a" | 288 android_app_abi = "arm64-v8a" |
| 289 android_app_secondary_abi = "armeabi-v7a" | |
| 289 } else if (current_cpu == "mips64el") { | 290 } else if (current_cpu == "mips64el") { |
| 290 android_app_abi = "mips64" | 291 android_app_abi = "mips64" |
| 292 android_app_secondary_abi = "mips" | |
| 291 } else { | 293 } else { |
| 292 assert(false, "Unknown Android ABI: " + current_cpu) | 294 assert(false, "Unknown Android ABI: " + current_cpu) |
| 293 } | 295 } |
| 294 | 296 |
| 295 if (android_libcpp_lib_dir == "") { | 297 if (android_libcpp_lib_dir == "") { |
| 296 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" | 298 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" |
| 297 } | 299 } |
| 298 } | 300 } |
| OLD | NEW |