From c7b5aea70a1dfbaf9f19f086e3d649adab492143 Mon Sep 17 00:00:00 2001
From: alk3pInjection <webmaster@raspii.tech>
Date: Fri, 15 Sep 2023 17:12:24 +0800
Subject: gs201: Allow running 32-bit apps

Change-Id: Ibf1e2d8313b0a2fd09bb0cf4c17f2774f20ee15a
---
 BoardConfig-common.mk | 3 ---
 aosp_common.mk        | 2 +-
 device.mk             | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index b5a7fc5b..3567af0d 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -32,9 +32,6 @@ 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
-
 # Force any prefer32 targets to be compiled as 64 bit.
 FORCE_MULTILIB_FIRST_ON_DEVICE := true
 
diff --git a/aosp_common.mk b/aosp_common.mk
index ce30f4f1..7cf42e32 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -17,7 +17,7 @@
 #
 # All components inherited here go to system image
 #
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
 
 # Enable CSI checking
diff --git a/device.mk b/device.mk
index 7a244a56..04d73cfa 100644
--- a/device.mk
+++ b/device.mk
@@ -974,7 +974,7 @@ include device/google/gs201/gnss/device-gnss.mk
 endif
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201/sepolicy/gps
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
 #$(call inherit-product-if-exists, hardware/google_devices/gs201/gs201.mk)
 #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
-- 
cgit v1.2.3