From 8fccbc318dfcd2e5047f71e4bbe7a18e7487cf0b Mon Sep 17 00:00:00 2001
From: MD Raza <delightreza@gmail.com>
Date: Mon, 3 Jun 2024 02:46:13 +0600
Subject: [PATCH] sm6225-common: extract-utils: extract CarrierSettings when
 only list exists

Signed-off-by: MD Raza <delightreza@gmail.com>
Change-Id: Iab770bfcec3fec3b2c0211c6c47e1bc6f675a38e
---
 extract-files.sh   | 6 ++++--
 setup-makefiles.sh | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/extract-files.sh b/extract-files.sh
index c414221..d09dde8 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -125,9 +125,11 @@ if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/propriet
         bash "${MY_DIR}/../../${VENDOR}/${DEVICE}/regen-carriersettings.sh" "$EXTRACT_TMP_DIR/super_dump/product.img" "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files-carriersettings.txt"
     fi
 
-    extract "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files-carriersettings.txt" ]; then
+        extract "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
-    extract_carriersettings
+        extract_carriersettings
+    fi
 
     if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" ]; then
         extract_firmware "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" "${SRC}"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index ab25abd..6147422 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -43,8 +43,10 @@ if [ -s "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" ]; then
     # The standard device blobs
     write_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files.txt" true
 
-    write_rro_package "CarrierConfigOverlay" "com.android.carrierconfig" product
-    write_single_product_packages "CarrierConfigOverlay"
+    if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-files-carriersettings.txt" ]; then
+        write_rro_package "CarrierConfigOverlay" "com.android.carrierconfig" product
+        write_single_product_packages "CarrierConfigOverlay"
+    fi
 
     if [ -f "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt" ]; then
         append_firmware_calls_to_makefiles "${MY_DIR}/../../${VENDOR}/${DEVICE}/proprietary-firmware.txt"