chromium/src
0
Fork 0
Code Activity

Android: Fix android_64bit_current_cpu being wrong for x64 & mips

Browse Source 
It was using target_cpu for these cases.
This bug is harmless since we always use 64-bit as the primary
toolchain (where target_cpu == current_cpu)

Bug: None
Change-Id: Id0b71f2cb227d2379bb09d13c4a0b5552f6c57c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6020003
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1382589}
This commit is contained in:
Andrew Grieve
2024-11-13 21:35:16 +00:00
committed by Chromium LUCI CQ
parent b31357b16f
commit f5c0373f9f
1 changed files with 3 additions and 2 deletions

5
build/config/android/abi.gni

@ -84,8 +84,9 @@ if (target_cpu == "arm64" || target_cpu == "x64" || target_cpu == "mips64el" ||
assert(false, "Unknown target CPU: $target_cpu")
}
android_64bit_current_cpu = current_cpu == "arm64" || target_cpu == "x64" ||
target_cpu == "mips64el" || current_cpu == "riscv64"
android_64bit_current_cpu =
current_cpu == "arm64" || current_cpu == "x64" ||
current_cpu == "mips64el" || current_cpu == "riscv64"
# Do not define android_secondary_abi_cpu or android_app_secondary_abi for
# target_cpu's that are 32-bit-only or 64-bit-only, as they are not used. The