From 8efe3440107dac446a1f21c7810fa26fb6cb3e66 Mon Sep 17 00:00:00 2001
From: gensis01 <sudeepyadav7272@gmail.com>
Date: Sun, 27 Jul 2025 12:00:00 +0000
Subject: [PATCH] pipa: Update repos for A16

---
 vendorsetup.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/vendorsetup.sh b/vendorsetup.sh
index 07da34a..8ef3297 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -60,10 +60,17 @@ clean_clone() {
 
 # Git clones (using clone_if_missing by default, as it's generally safer for initial setup)
 echo "Setting up repositories..."
+<<<<<<< HEAD
 clone_if_missing "https://github.com/glitch-wraith/android_device_xiaomi_sm8250-common" "15-qpr2" "device/xiaomi/sm8250-common"
 clone_if_missing "https://github.com/glitch-wraith/android_kernel_xiaomi_sm8250" "axksu" "kernel/xiaomi/sm8250"
 clone_if_missing "https://github.com/glitch-wraith/proprietary_vendor_xiaomi_sm8250-common" "15" "vendor/xiaomi/sm8250-common"
 clone_if_missing "https://github.com/glitch-wraith/proprietary_vendor_xiaomi_pipa" "15" "vendor/xiaomi/pipa"
+=======
+clone_if_missing "https://github.com/glitch-wraith/android_device_xiaomi_sm8250-common" "16.0" "device/xiaomi/sm8250-common"
+clone_if_missing "https://github.com/glitch-wraith/android_kernel_xiaomi_sm8250" "bpf-ksu" "kernel/xiaomi/sm8250"
+clone_if_missing "https://github.com/glitch-wraith/proprietary_vendor_xiaomi_sm8250-common" "16.0" "vendor/xiaomi/sm8250-common"
+clone_if_missing "https://github.com/glitch-wraith/proprietary_vendor_xiaomi_pipa" "16.0" "vendor/xiaomi/pipa"
+>>>>>>> ed84a65 (pipa: Update repos for A16)
 
 # Additional repos
 clone_if_missing "https://github.com/LineageOS/android_hardware_xiaomi" "lineage-22.2" "hardware/xiaomi"
@@ -209,11 +216,18 @@ fi
 mkdir -p "${DEVICE_PATH}/source-patches" || { echo "Error: Failed to create source-patches directory."; exit 1; }
 
 # Apply patches
+<<<<<<< HEAD
 apply_recovery_patch || { echo "Recovery patch application failed."; exit 1; }
 
 # Setup firmware
 setup_firmware || { echo "Firmware setup failed."; exit 1; }
+=======
+apply_recovery_patch || {
+    echo "Error: Recovery patch application failed."
+    exit 1
+}
+>>>>>>> ed84a65 (pipa: Update repos for A16)
 
 echo "-------------------------------------"
 echo "           Setup complete!           "
-echo "-------------------------------------"
\ No newline at end of file
+echo "-------------------------------------"