Force build everything as 64 bit. am: f60ad6f3dd

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19294720

Change-Id: I973818402b26d01b43d57728a46ba2370d3ea131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Ferris 2022-07-15 20:27:22 +00:00 committed by Automerger Merge Worker
commit c803bbc4da

View file

@ -34,6 +34,11 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a55
# Enable 64-bit for non-zygote. # Enable 64-bit for non-zygote.
ZYGOTE_FORCE_64 := true ZYGOTE_FORCE_64 := true
# Force any prefer32 targets to be compiled as 64 bit.
FORCE_MULTILIB_FIRST_ON_DEVICE := true
# Build the 32 bit targets
TARGET_2ND_ARCH := arm TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI := armeabi-v7a