From 34e6ccbc755e821050194babb17bdee6f6c32ea5 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Thu, 7 Mar 2024 14:38:09 +0200
Subject: [PATCH] use generic cpu variant

* AOSP14 QPR2 (android-14.0.0_r29) introduced some (bionic?) changes that
  fail to boot on rpi4 with cortex-a72 CPU variant.
* Neither cortex-a72/cortex-a72 nor cortex-a53/generic TARGET_CPU_VARIANT/
  TARGET_2ND_CPU_VARIANT combinations seem to work. Use generic CPU variant.
* Fixes https://github.com/raspberry-vanilla/android_local_manifest/issues/70.
---
 BoardConfig.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1f93188..cab3351 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -16,13 +16,13 @@ TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := cortex-a72
+TARGET_CPU_VARIANT := generic
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a72
+TARGET_2ND_CPU_VARIANT := generic
 
 # Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth