Merge "Switch to IGNORE_PREFER32_ON_DEVICE." am: 9c2cdd2219 am: 566efdc77c am: 9bb722f0a2

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

Change-Id: I0f5140bc7e6a68ae645b91626fed7172ef9f5154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Ferris 2022-11-16 23:49:35 +00:00 committed by Automerger Merge Worker
commit 3a2abe3626

View file

@ -36,7 +36,7 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a55
ZYGOTE_FORCE_64 := true ZYGOTE_FORCE_64 := true
# Force any prefer32 targets to be compiled as 64 bit. # Force any prefer32 targets to be compiled as 64 bit.
FORCE_MULTILIB_FIRST_ON_DEVICE := true IGNORE_PREFER32_ON_DEVICE := true
# Build the 32 bit targets # Build the 32 bit targets
TARGET_2ND_ARCH := arm TARGET_2ND_ARCH := arm