Force build everything as 64 bit.

When building the 64 bit and the 32 bit executables, there
are a few targets that are prefer32. Using this option forces
those executables to be built as 64 bit.

Bug: 229787331

Test: With this option, drmserver/mediaserver are built as 64 bit.
Test: Without this option, drmserver/mediaserver are built as 32 bit.
Change-Id: Ie76ffe17f14b5157983796a616436bfa12987136
This commit is contained in:
Christopher Ferris 2022-07-15 00:26:14 +00:00
parent 0da7092027
commit f60ad6f3dd

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