From a51df496498ec13be1afda6527e10ae708344509 Mon Sep 17 00:00:00 2001
From: Nehemiah of Zebulun <nehemiah-zb@mezimmah.net>
Date: Wed, 22 Jan 2025 12:48:09 +0100
Subject: [PATCH] Press on

---
 jelly_star/jelly_star.mk                      | 53 ++++++------------
 .../base/core/res/res/values/config.xml       | 56 -------------------
 2 files changed, 16 insertions(+), 93 deletions(-)
 delete mode 100644 jelly_star/overlay/frameworks/base/core/res/res/values/config.xml

diff --git a/jelly_star/jelly_star.mk b/jelly_star/jelly_star.mk
index b69c2b3..9fd4b0f 100644
--- a/jelly_star/jelly_star.mk
+++ b/jelly_star/jelly_star.mk
@@ -1,47 +1,26 @@
-TARGET_GAPPS_ARCH := arm64
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk
 
-include build/make/target/product/aosp_arm64.mk
-include build/make/target/product/gsi_release.mk
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
+MODULE_BUILD_FROM_SOURCE := true
+PRODUCT_CHARACTERISTICS := device
 
-PRODUCT_NAME := gsi_arm64
-PRODUCT_DEVICE := jelly_star
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := GSI on ARM64
+$(call inherit-product, device/generic/common/gsi_system_ext.mk)
+$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
+$(call inherit-product, device/generic/common/gsi_product.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/jelly_star/overlay
 
 PRODUCT_COPY_FILES += \
 	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 
-PRODUCT_CHARACTERISTICS := device
-PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT :=
-PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
-PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
-QSB_ON_FIRST_SCREEN := false
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/jelly_star/overlay
-WEBVIEW_IMPLEMENTATION := geckoview
-
 PRODUCT_PACKAGES += \
-	AvesLibre \
-	BreezyWeather \
 	Contacts \
-	Clock \
-	Conversations \
-	ConverterNow \
-	Davx5 \
 	Etar \
-	K-9Mail \
-	Linphone \
-	MuPDFViewer \
-	Nextcloud \
-	OpenDocumentReader \
-	SimpleCalculator \
-	SimpleCamera \
-	TranslateYou \
-	TrichromeWebView \
-	Wireguard
+	TrichromeWebView
 
-PRODUCT_PACKAGES -= \
-	EasterEgg \
-	webview \
-	libwebviewchromium_loader \
-	libwebviewchromium_plat_support
+PRODUCT_NAME := jelly_star
+PRODUCT_DEVICE := generic_arm64
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := GSI on ARM64
diff --git a/jelly_star/overlay/frameworks/base/core/res/res/values/config.xml b/jelly_star/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index b3ab443..0000000
--- a/jelly_star/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-	<string-array translatable="false" name="config_tether_usb_regexs">
-		<item>"usb\\d"</item>
-		<item>"rndis\\d"</item>
-	</string-array>
-
-	<string-array translatable="false" name="config_tether_wifi_regexs">
-		<item>"wlan0"</item>
-		<item>"softap.*"</item>
-		<item>"wifi_br0"</item>
-		<item>"wigig0"</item>
-	</string-array>
-
-	<string-array translatable="false" name="config_tether_bluetooth_regexs">
-        <item>bnep\\d</item>
-		<item>"bt-pan"</item>
-	</string-array>
-
-	<bool name="config_enableAutoPowerModes">true</bool>
-	<bool name="config_intrusiveNotificationLed">true</bool>
-	<string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
-	<bool name="config_useRoundIcon">true</bool>
-
-	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
-	<bool name="config_unplugTurnsOnScreen">true</bool>
-	<integer name="config_multiuserMaximumUsers">5</integer>
-	<bool name="config_enableMultiUserUI">true</bool>
-
-	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
-	<bool name="config_swipe_up_gesture_setting_available">true</bool>
-	<bool name="config_smart_battery_available">true</bool>
-	<dimen name="config_dialogCornerRadius">8.0dip</dimen>
-	<dimen name="config_buttonCornerRadius">4.0dip</dimen>
-
-	<bool name="config_cellBroadcastAppLinks">true</bool>
-
-    <array name="config_availableColorModes">
-        <!-- ColorDisplayManager.COLOR_MODE_NATURAL -->
-        <item>0</item>
-        <!-- ColorDisplayManager.COLOR_MODE_BOOSTED -->
-        <item>1</item>
-        <!-- ColorDisplayManager.COLOR_MODE_SATURATED -->
-        <item>2</item>
-        <!-- ColorDisplayManager.COLOR_MODE_AUTOMATIC -->
-        <item>3</item>
-    </array>
-
-    <bool name="config_supportAudioSourceUnprocessed">true</bool>
-
-    <string name="config_displayLightSensorType" translatable="false">android.sensor.light</string>
-
-    <integer name="config_defaultNightMode">2</integer>
-    
-    <bool name="config_useDevInputEventForAudioJack">true</bool>
-</resources>