From 0afe05ff226ef068a66553700f54de6c18650082 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 18 Aug 2023 12:36:16 -0400
Subject: [PATCH] Push apollon to 20.0

Signed-off-by: Tad <tad@spotco.us>
---
 Manifests/Manifest_LAOS-19.1.xml    |  4 ----
 Manifests/Manifest_LAOS-20.0.xml    | 19 +++++++++++--------
 Scripts/LineageOS-19.1/Functions.sh |  1 -
 Scripts/LineageOS-20.0/Functions.sh |  1 +
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Manifests/Manifest_LAOS-19.1.xml b/Manifests/Manifest_LAOS-19.1.xml
index 708909f1..7164bc3d 100644
--- a/Manifests/Manifest_LAOS-19.1.xml
+++ b/Manifests/Manifest_LAOS-19.1.xml
@@ -112,10 +112,6 @@
 	<project path="device/xiaomi/sm8250-common" name="LineageOS/android_device_xiaomi_sm8250-common" remote="github" />
 	<project path="kernel/xiaomi/sm8250" name="LineageOS/android_kernel_xiaomi_sm8250" remote="github" />
 
-	<!-- Xiaomi Mi 10T / Mi 10T Pro / Redmi K30S Ultra (apollon) -->
-	<project path="device/xiaomi/apollon" name="LineageOS/android_device_xiaomi_apollon" remote="github" />
-	<!-- uses xiaomi sm8250 commons -->
-
 	<!-- Xiaomi POCO X3 Pro (vayu) -->
 	<project path="device/xiaomi/vayu" name="LineageOS/android_device_xiaomi_vayu" remote="github" />
 	<project path="device/xiaomi/sm8150-common" name="LineageOS/android_device_xiaomi_sm8150-common" remote="github" />
diff --git a/Manifests/Manifest_LAOS-20.0.xml b/Manifests/Manifest_LAOS-20.0.xml
index a1da9346..78c7264b 100644
--- a/Manifests/Manifest_LAOS-20.0.xml
+++ b/Manifests/Manifest_LAOS-20.0.xml
@@ -247,14 +247,6 @@
 	<project path="device/xiaomi/sdm845-common" name="LineageOS/android_device_xiaomi_sdm845-common" remote="github" revision="lineage-20" />
 	<project path="kernel/xiaomi/sdm845" name="LineageOS/android_kernel_xiaomi_sdm845" remote="github" revision="lineage-20" />
 
-	<!-- Xiaomi POCO F2 Pro / Redmi K30 Pro / Redmi K30 Pro Zoom Edition (lmi) -->
-	<project path="device/xiaomi/lmi" name="LineageOS/android_device_xiaomi_lmi" remote="github" revision="lineage-20" />
-	<project path="device/xiaomi/sm8250-common" name="LineageOS/android_device_xiaomi_sm8250-common" remote="github" revision="lineage-20" />
-	<project path="kernel/xiaomi/sm8250" name="LineageOS/android_kernel_xiaomi_sm8250" remote="github" revision="lineage-20" />
-
-	<!-- Xiaomi POCO F3 / Redmi K40 / Mi 11X (alioth) -->
-	<project path="device/xiaomi/alioth" name="LineageOS/android_device_xiaomi_alioth" remote="github" revision="lineage-20" />
-
 	<!-- Xiaomi Mi 8 (dipper) -->
 	<project path="device/xiaomi/dipper" name="LineageOS/android_device_xiaomi_dipper" remote="github" revision="lineage-20" />
 
@@ -267,6 +259,17 @@
 	<!-- Xiaomi Mi 8 Explorer Edition (ursa) -->
 	<project path="device/xiaomi/ursa" name="LineageOS/android_device_xiaomi_ursa" remote="github" revision="lineage-20" />
 
+	<!-- Xiaomi POCO F2 Pro / Redmi K30 Pro / Redmi K30 Pro Zoom Edition (lmi) -->
+	<project path="device/xiaomi/lmi" name="LineageOS/android_device_xiaomi_lmi" remote="github" revision="lineage-20" />
+	<project path="device/xiaomi/sm8250-common" name="LineageOS/android_device_xiaomi_sm8250-common" remote="github" revision="lineage-20" />
+	<project path="kernel/xiaomi/sm8250" name="LineageOS/android_kernel_xiaomi_sm8250" remote="github" revision="lineage-20" />
+
+	<!-- Xiaomi Mi 10T / Mi 10T Pro / Redmi K30S Ultra (apollon) -->
+	<project path="device/xiaomi/apollon" name="LineageOS/android_device_xiaomi_apollon" remote="github" />
+
+	<!-- Xiaomi POCO F3 / Redmi K40 / Mi 11X (alioth) -->
+	<project path="device/xiaomi/alioth" name="LineageOS/android_device_xiaomi_alioth" remote="github" revision="lineage-20" />
+
         <!-- Proprietary Blobs -->
 	<project path="vendor/fairphone/FP3" name="[COLOUR IN THE LINES]/proprietary_vendor_fairphone_FP3" remote="github" revision="lineage-20" />
 	<project path="vendor/fairphone/FP4" name="[COLOUR IN THE LINES]/proprietary_vendor_fairphone_FP4" remote="github" revision="lineage-20" />
diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh
index b8707f80..7aa31864 100644
--- a/Scripts/LineageOS-19.1/Functions.sh
+++ b/Scripts/LineageOS-19.1/Functions.sh
@@ -74,7 +74,6 @@ buildAll() {
 	buildDevice vayu avb;
 	#SD865
 	buildDevice lmi avb; #20.0 doesn't support lmipro
-	buildDevice apollon avb;
 }
 export -f buildAll;
 
diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh
index f0f2a31a..22bc4629 100644
--- a/Scripts/LineageOS-20.0/Functions.sh
+++ b/Scripts/LineageOS-20.0/Functions.sh
@@ -112,6 +112,7 @@ buildAll() {
 	buildDevice sargo avb; #unb
 	#SD865
 	buildDevice lmi avb;
+	buildDevice apollon avb;
 	#SD870
 	buildDevice alioth avb;
 	#Tensor