From 69a019e7be4e969abe447bc4dfc8759f63034863 Mon Sep 17 00:00:00 2001
From: borbelyvince <borbely.vince.11@gmail.com>
Date: Tue, 16 Apr 2024 17:31:48 +0200
Subject: [PATCH] r8s: adapt for universal9830

---
 BoardConfig.mk     | 2 +-
 device.mk          | 2 +-
 extract-files.sh   | 2 +-
 setup-makefiles.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3f61a4e..b955dac 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -50,7 +50,7 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X
 QC_WIFI_HIDL_FEATURE_DUAL_AP := true
 
 # inherit from common
-include device/samsung/exynos990-common/BoardConfigCommon.mk
+include device/samsung/universal9830-common/BoardConfigCommon.mk
 
 # inherit from the proprietary version
 -include vendor/samsung/r8s/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 88b7f57..471b6b5 100644
--- a/device.mk
+++ b/device.mk
@@ -44,7 +44,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
 
 # Inherit from common
-$(call inherit-product, device/samsung/exynos990-common/device-common.mk)
+$(call inherit-product, device/samsung/universal9830-common/device-common.mk)
 
 # Inherit from the proprietary version
 $(call inherit-product-if-exists, vendor/samsung/r8s/r8s-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index fb3b6d6..3340e35 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -44,7 +44,7 @@ fi
 set -e
 
 export DEVICE=r8s
-export DEVICE_COMMON=exynos990-common
+export DEVICE_COMMON=universal9830-common
 export VENDOR=samsung
 
 "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index bfaeb42..6c43b2b 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -9,7 +9,7 @@
 set -e
 
 export DEVICE=r8s
-export DEVICE_COMMON=exynos990-common
+export DEVICE_COMMON=universal9830-common
 export VENDOR=samsung
 
 "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"