From f60ad6f3dd446f12c30c97df214d8f17c2786e92 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Fri, 15 Jul 2022 00:26:14 +0000 Subject: [PATCH] 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 --- BoardConfig-common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 3625f0a3..34620e75 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -34,6 +34,11 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a55 # Enable 64-bit for non-zygote. 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_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a