From 6af6e4d1b849936b3a4e5eec3eea221c449a3b60 Mon Sep 17 00:00:00 2001
From: oxmc7769 <oxmc7769.mail@gmail.com>
Date: Sat, 30 May 2026 01:59:03 -0700
Subject: [PATCH] Fix paths

---
 device.mk             | 5 +++++
 pawlet_rpi5.mk        | 3 ---
 pawlet_rpi5_car.mk    | 3 ---
 pawlet_rpi5_phone.mk  | 3 ---
 pawlet_rpi5_tablet.mk | 3 ---
 pawlet_rpi5_tv.mk     | 3 ---
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/device.mk b/device.mk
index 8b72831..c35cd11 100644
--- a/device.mk
+++ b/device.mk
@@ -9,6 +9,11 @@ DEVICE_PATH := device/pawlet/rpi5
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
 $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
 
+# PawletOS vendor (HALs, updater, version props, A/B OTA config)
+$(call inherit-product, vendor/pawlet/config/common.mk)
+# PawletOS RPI HALs and configs
+$(call inherit-product, vendor/pawlet/config/rpi_common.mk)
+
 # APEX
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 OVERRIDE_PRODUCT_COMPRESSED_APEX := false
diff --git a/pawlet_rpi5.mk b/pawlet_rpi5.mk
index 80a2dac..6a0eee0 100644
--- a/pawlet_rpi5.mk
+++ b/pawlet_rpi5.mk
@@ -9,9 +9,6 @@ DEVICE_PATH := device/pawlet/rpi5
 # Inherit device configuration
 $(call inherit-product, $(DEVICE_PATH)/device.mk)
 
-# PawletOS vendor (HALs, updater, version props, A/B OTA config)
-$(call inherit-product, vendor/pawlet/config/common.mk)
-
 # Device Product Configuration
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
diff --git a/pawlet_rpi5_car.mk b/pawlet_rpi5_car.mk
index 2aad157..c042045 100644
--- a/pawlet_rpi5_car.mk
+++ b/pawlet_rpi5_car.mk
@@ -9,9 +9,6 @@ DEVICE_PATH := device/pawlet/rpi5
 # Inherit device configuration
 $(call inherit-product, $(DEVICE_PATH)/device.mk)
 
-# PawletOS vendor (HALs, updater, version props, A/B OTA config)
-$(call inherit-product, vendor/pawlet/config/common.mk)
-
 # Device Product Configuration
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
diff --git a/pawlet_rpi5_phone.mk b/pawlet_rpi5_phone.mk
index d740b9c..2decdda 100644
--- a/pawlet_rpi5_phone.mk
+++ b/pawlet_rpi5_phone.mk
@@ -9,9 +9,6 @@ DEVICE_PATH := device/pawlet/rpi5
 # Inherit device configuration
 $(call inherit-product, $(DEVICE_PATH)/device.mk)
 
-# PawletOS vendor (HALs, updater, version props, A/B OTA config)
-$(call inherit-product, vendor/pawlet/config/common.mk)
-
 # Device Product Configuration
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi xhdpi
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
diff --git a/pawlet_rpi5_tablet.mk b/pawlet_rpi5_tablet.mk
index 9587263..0460244 100644
--- a/pawlet_rpi5_tablet.mk
+++ b/pawlet_rpi5_tablet.mk
@@ -9,9 +9,6 @@ DEVICE_PATH := device/pawlet/rpi5
 # Inherit device configuration
 $(call inherit-product, $(DEVICE_PATH)/device.mk)
 
-# PawletOS vendor (HALs, updater, version props, A/B OTA config)
-$(call inherit-product, vendor/pawlet/config/common.mk)
-
 # Device Product Configuration
 PRODUCT_AAPT_CONFIG := normal mdpi hdpi
 PRODUCT_AAPT_PREF_CONFIG := hdpi
diff --git a/pawlet_rpi5_tv.mk b/pawlet_rpi5_tv.mk
index c861900..070ae03 100644
--- a/pawlet_rpi5_tv.mk
+++ b/pawlet_rpi5_tv.mk
@@ -9,9 +9,6 @@ DEVICE_PATH := device/pawlet/rpi5
 # Inherit device configuration
 $(call inherit-product, $(DEVICE_PATH)/device.mk)
 
-# PawletOS vendor (HALs, updater, version props, A/B OTA config)
-$(call inherit-product, vendor/pawlet/config/common.mk)
-
 # Device Product Configuration
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
 PRODUCT_CHARACTERISTICS := tv