From 475a5d1b8100431ddb9d4704a702109f685e90dd Mon Sep 17 00:00:00 2001
From: Nehemiah of Zebulun <nehemiah-zb@mezimmah.net>
Date: Wed, 20 Dec 2023 11:08:41 -0500
Subject: [PATCH] Update QinF21 Pro

---
 qinf21pro/board-base.mk            |  1 -
 qinf21pro/qinf21pro.mk             | 53 +++++++++++++++++++++---------
 qinf21pro/qinf21pro/BoardConfig.mk | 27 +++++++++++++--
 ttp/ttp.mk                         |  2 +-
 4 files changed, 63 insertions(+), 20 deletions(-)
 delete mode 100644 qinf21pro/board-base.mk

diff --git a/qinf21pro/board-base.mk b/qinf21pro/board-base.mk
deleted file mode 100644
index b7581f9..0000000
--- a/qinf21pro/board-base.mk
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_SYSTEM_PROP := device/wephone/qinf21pro/system.prop $(TARGET_SYSTEM_PROP)
\ No newline at end of file
diff --git a/qinf21pro/qinf21pro.mk b/qinf21pro/qinf21pro.mk
index a00df5f..cc258f2 100644
--- a/qinf21pro/qinf21pro.mk
+++ b/qinf21pro/qinf21pro.mk
@@ -1,20 +1,34 @@
-# Use a more decent APN config
-PRODUCT_COPY_FILES += \
-	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
-TARGET_GAPPS_ARCH := arm64
+#
+# All components inherited here go to system_ext image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
 
-include build/make/target/product/aosp_arm64_ab.mk
+#
+# All components inherited here go to product image
+#
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 
-PRODUCT_NAME := qinf21pro
-PRODUCT_DEVICE := qinf21pro
-PRODUCT_BRAND := wephone
-PRODUCT_MODEL := weOs | v11.0.1 | Nehemiah
+#
+# Special settings for GSI releasing
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
 
-# This is for a device
 PRODUCT_CHARACTERISTICS := device
 
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/qinf21pro/overlay
+PRODUCT_NAME := ttp
+PRODUCT_DEVICE := qinf21pro
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on ARM64
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
 
 PRODUCT_COPY_FILES += \
 	device/wephone/qinf21pro/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
@@ -25,8 +39,17 @@ PRODUCT_COPY_FILES += \
 	device/wephone/qinf21pro/files/mtk-pmic-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-pmic-keys.kl \
 	device/wephone/qinf21pro/files/Vendor_0001_Product_0001_Version_0100.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/Vendor_0001_Product_0001_Version_0100.kl
 
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
 PRODUCT_PACKAGES += \
-	BromiteSystemWebView \
 	Conversations \
 	Davx5 \
 	DeskClock \
@@ -38,12 +61,12 @@ PRODUCT_PACKAGES += \
 	Nextcloud \
 	NextcloudNotes \
 	OpenDocumentReader \
+	OpenCamera \
+	TrichromeWebView \
 	Wireguard
 
 PRODUCT_PACKAGES -= \
 	EasterEgg \
 	webview \
 	libwebviewchromium_loader \
-	libwebviewchromium_plat_support \
-	CtsShimPrebuilt \
-	CtsShimPrivPrebuilt
+	libwebviewchromium_plat_support
diff --git a/qinf21pro/qinf21pro/BoardConfig.mk b/qinf21pro/qinf21pro/BoardConfig.mk
index 4ae713c..fb830a4 100644
--- a/qinf21pro/qinf21pro/BoardConfig.mk
+++ b/qinf21pro/qinf21pro/BoardConfig.mk
@@ -1,8 +1,29 @@
-include build/make/target/board/generic_arm64_ab/BoardConfig.mk
-include device/wephone/qinf21pro/board-base.mk
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+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
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
 else
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
-endif
+endif
\ No newline at end of file
diff --git a/ttp/ttp.mk b/ttp/ttp.mk
index d33a808..7a35090 100644
--- a/ttp/ttp.mk
+++ b/ttp/ttp.mk
@@ -71,4 +71,4 @@ PRODUCT_PACKAGES -= \
 	EasterEgg \
 	webview \
 	libwebviewchromium_loader \
-    libwebviewchromium_plat_support
+	libwebviewchromium_plat_support