From cae24b40a90f96c83b2d5d3f92fd56750fdcf9f7 Mon Sep 17 00:00:00 2001
From: oxmc <oxmc@noreply.localhost>
Date: Mon, 18 Aug 2025 18:28:44 -0700
Subject: [PATCH] Update pawlet_rpi4.mk

---
 pawlet_rpi4.mk | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pawlet_rpi4.mk b/pawlet_rpi4.mk
index 8e741c4..86785cf 100644
--- a/pawlet_rpi4.mk
+++ b/pawlet_rpi4.mk
@@ -5,19 +5,23 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit from the base Raspberry Pi 4 product
+# Inherit from base Raspberry Pi 4 product
 $(call inherit-product, device/brcm/rpi4/aosp_rpi4.mk)
 
-# Include remove_packages.mk
+# Include package removal file (if still needed)
 $(call inherit-product, device/pawlet/rpi/remove_packages.mk)
 
-# Configs
+# Display configurations
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
 
-# Remove specific packages
+# Remove all stock launcher variants
 PRODUCT_PACKAGES -= \
+    Launcher3 \
+    Launcher3QuickStep \
+    Launcher3Go \
+    TrebuchetQuickStep \
     Galaxy4 \
     HoloSpiralWallpaper \
     LiveWallpapers \
@@ -26,22 +30,26 @@ PRODUCT_PACKAGES -= \
     NoiseField \
     PhaseBeam \
     VisualizationWallpapers \
-    PhotoTable \
-    Launcher3 \
-    Launcher3QuickStep \
-    Launcher3Go \
-    TrebuchetQuickStep
+    PhotoTable
 
-# Add Lawnchair and set it to override stock launchers
+# Add Lawnchair package
 PRODUCT_PACKAGES += \
-    Lawnchair \
-    LawnchairOverrides
+    Lawnchair
 
-# Overlays
+# Declare Lawnchair's Soong namespace (if using custom build)
+PRODUCT_SOONG_NAMESPACES += \
+    packages/apps/Lawnchair
+
+# Force Lawnchair to override stock launchers
+PRODUCT_SOONG_OVERRIDES += \
+    Lawnchair:Launcher3 \
+    Lawnchair:Launcher3QuickStep
+
+# Device-specific overlays (keep your existing FrameworkRes overlay)
 PRODUCT_PACKAGES += \
     FrameworkResDevOxmcOverlay
 
-# Device identifier
+# Device identification
 PRODUCT_DEVICE := rpi4
 PRODUCT_NAME := pawlet_rpi4
 PRODUCT_BRAND := Raspberry