| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 ------------------------------------------------------------- |
| 312 # android_64bit_target_cpu has been deprecated and will soon be removed. Use |
| 313 # is_target_cpu_64bit instead (see //build/config/compiler/compiler.gni). |
| 314 # Note: This variable cannot take the value of is_target_cpu_64bit directly, |
| 315 # as that would cause an import loop. |
| 316 # TODO(agrieve): Remove this variable once it's no longer used downstream. |
| 317 # https://crbug.com/671624 |
| 312 if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el")
{ | 318 if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el")
{ |
| 313 android_64bit_target_cpu = true | 319 android_64bit_target_cpu = true |
| 314 } else if (target_cpu == "arm" || target_cpu == "x86" || | 320 } else if (target_cpu == "arm" || target_cpu == "x86" || |
| 315 target_cpu == "mipsel") { | 321 target_cpu == "mipsel") { |
| 316 android_64bit_target_cpu = false | 322 android_64bit_target_cpu = false |
| 317 } else { | 323 } else { |
| 318 assert(false, "Unknown target CPU: $target_cpu") | 324 assert(false, "Unknown target CPU: $target_cpu") |
| 319 } | 325 } |
| 320 | 326 |
| 321 # Intentionally do not define android_app_secondary_abi_cpu and | 327 # Intentionally do not define android_app_secondary_abi_cpu and |
| (...skipping 18 matching lines...) Expand all Loading... |
| 340 "//build/toolchain/android:android_${android_secondary_abi_cpu}" | 346 "//build/toolchain/android:android_${android_secondary_abi_cpu}" |
| 341 } | 347 } |
| 342 } | 348 } |
| 343 } | 349 } |
| 344 | 350 |
| 345 declare_args() { | 351 declare_args() { |
| 346 # Enables used resource whitelist generation. Set for official builds only | 352 # Enables used resource whitelist generation. Set for official builds only |
| 347 # as a large amount of build output is generated. | 353 # as a large amount of build output is generated. |
| 348 enable_resource_whitelist_generation = is_android && is_official_build | 354 enable_resource_whitelist_generation = is_android && is_official_build |
| 349 } | 355 } |
| OLD | NEW |