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 if (is_android) { | 7 if (is_android) { |
| 8 import("//build_overrides/build.gni") | 8 import("//build_overrides/build.gni") |
| 9 | 9 |
| 10 has_chrome_android_internal = | 10 has_chrome_android_internal = |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 301 } else if (current_cpu == "mips64el") { | 301 } else if (current_cpu == "mips64el") { |
| 302 android_app_abi = "mips64" | 302 android_app_abi = "mips64" |
| 303 } else { | 303 } else { |
| 304 assert(false, "Unknown Android ABI: " + current_cpu) | 304 assert(false, "Unknown Android ABI: " + current_cpu) |
| 305 } | 305 } |
| 306 | 306 |
| 307 if (android_libcpp_lib_dir == "") { | 307 if (android_libcpp_lib_dir == "") { |
| 308 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" | 308 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" |
| 309 } | 309 } |
| 310 | 310 |
| 311 # Secondary ABI ------------------------------------------------------------- | 311 # Secondary ABI -------------------------------------------------------------s |
| 312 if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el") { | |
|
agrieve
2016/12/06 14:57:44
nit: It would be better to leave android_64bit_tar
slan
2016/12/06 15:19:38
Done.
| |
| 313 android_64bit_target_cpu = true | |
| 314 } else if (target_cpu == "arm" || target_cpu == "x86" || | |
| 315 target_cpu == "mipsel") { | |
| 316 android_64bit_target_cpu = false | |
| 317 } else { | |
| 318 assert(false, "Unknown target CPU: $target_cpu") | |
| 319 } | |
| 320 | |
| 321 # Intentionally do not define android_app_secondary_abi_cpu and | 312 # Intentionally do not define android_app_secondary_abi_cpu and |
| 322 # android_app_secondary_abi for 32-bit target_cpu, since they are not used. | 313 # android_app_secondary_abi for 32-bit target_cpu, since they are not used. |
| 323 if (target_cpu == "arm64") { | 314 if (target_cpu == "arm64") { |
| 324 android_secondary_abi_cpu = "arm" | 315 android_secondary_abi_cpu = "arm" |
| 325 android_app_secondary_abi = "armeabi-v7a" | 316 android_app_secondary_abi = "armeabi-v7a" |
| 326 } else if (target_cpu == "x64") { | 317 } else if (target_cpu == "x64") { |
| 327 android_secondary_abi_cpu = "x86" | 318 android_secondary_abi_cpu = "x86" |
| 328 android_app_secondary_abi = "x86" | 319 android_app_secondary_abi = "x86" |
| 329 } else if (target_cpu == "mips64el") { | 320 } else if (target_cpu == "mips64el") { |
| 330 android_secondary_abi_cpu = "mipsel" | 321 android_secondary_abi_cpu = "mipsel" |
| 331 android_app_secondary_abi = "mips" | 322 android_app_secondary_abi = "mips" |
| 332 } | 323 } |
| 333 | 324 |
| 334 if (defined(android_secondary_abi_cpu)) { | 325 if (defined(android_secondary_abi_cpu)) { |
| 335 if (is_clang) { | 326 if (is_clang) { |
| 336 android_secondary_abi_toolchain = | 327 android_secondary_abi_toolchain = |
| 337 "//build/toolchain/android:android_clang_${android_secondary_abi_cpu}" | 328 "//build/toolchain/android:android_clang_${android_secondary_abi_cpu}" |
| 338 } else { | 329 } else { |
| 339 android_secondary_abi_toolchain = | 330 android_secondary_abi_toolchain = |
| 340 "//build/toolchain/android:android_${android_secondary_abi_cpu}" | 331 "//build/toolchain/android:android_${android_secondary_abi_cpu}" |
| 341 } | 332 } |
| 342 } | 333 } |
| 343 } | 334 } |
| 344 | 335 |
| 345 declare_args() { | 336 declare_args() { |
| 346 # Enables used resource whitelist generation. Set for official builds only | 337 # Enables used resource whitelist generation. Set for official builds only |
| 347 # as a large amount of build output is generated. | 338 # as a large amount of build output is generated. |
| 348 enable_resource_whitelist_generation = is_android && is_official_build | 339 enable_resource_whitelist_generation = is_android && is_official_build |
| 349 } | 340 } |
| OLD | NEW |