summaryrefslogtreecommitdiff
path: root/BoardConfig-common.mk
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2022-07-15 21:17:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-15 21:17:48 +0000
commit30f484b7f0c837e708f50a930c637ce66758eb99 (patch)
treec14f2b3c4ccaad310e3f24b67bbac1cda53a43a5 /BoardConfig-common.mk
parentf35aa2aacfa5ba0b50e7bd2b36af1c8c21e18e23 (diff)
parent4d669c5f0f83c215a6f0a9e3cd054d7b9690f07f (diff)
downloadgs201-30f484b7f0c837e708f50a930c637ce66758eb99.tar.gz
Force build everything as 64 bit. am: f60ad6f3dd am: c803bbc4da am: 4d669c5f0f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19294720 Change-Id: I8051b0de31adfc613aad5f54e897e1ba365acdb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'BoardConfig-common.mk')
-rw-r--r--BoardConfig-common.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 88082c9..9f8e519 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