From 377294ed9dbcb0546a97656f24f3b8fdc7461d12 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Wed, 13 Jul 2022 05:05:27 +0000
Subject: [PATCH] Enable 32 bit building, but only 64 bit zygote.

Bug: 229787331
Test: Build/Boot in progress.
Change-Id: I4686b567fd96a6cd7c3f6e269f0424811c0b3d6a
---
 BoardConfig-common.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index f6907312..3625f0a3 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -32,6 +32,15 @@ TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_VARIANT := cortex-a55
 TARGET_CPU_VARIANT_RUNTIME := cortex-a55
 
+# Enable 64-bit for non-zygote.
+ZYGOTE_FORCE_64 := true
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53
+
 BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y