From b91cb59bca2ca9af56e313334ae05d8936d02b6d Mon Sep 17 00:00:00 2001
From: ahmedtohamy1 <1ahmed.tohamy@gmail.com>
Date: Tue, 16 Apr 2024 15:42:08 +0000
Subject: [PATCH] Revert "apollon: Initiate rebrand"

This reverts commit eb43dafe4f10f57f0aa86341da00f888f955a4c3.
---
 Android.mk                              | 2 +-
 AndroidProducts.mk                      | 8 ++++----
 BoardConfig.mk                          | 4 ++--
 README.md                               | 2 +-
 device.mk                               | 2 +-
 extract-files.sh                        | 2 +-
 lineage_apollon.mk => lineage_apollo.mk | 8 ++++----
 setup-makefiles.sh                      | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename lineage_apollon.mk => lineage_apollo.mk (83%)

diff --git a/Android.mk b/Android.mk
index 0f09ad3..c40f0cf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),apollon)
+ifeq ($(TARGET_DEVICE),apollo)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 599653e..d0a415d 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -5,9 +5,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_apollon.mk
+    $(LOCAL_DIR)/lineage_apollo.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_apollon-user \
-    lineage_apollon-userdebug \
-    lineage_apollon-eng
+    lineage_apollo-user \
+    lineage_apollo-userdebug \
+    lineage_apollo-eng
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9b2c0bc..1d103cb 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/xiaomi/apollon
+DEVICE_PATH := device/xiaomi/apollo
 
 # Inherit from sm8250-common
 include device/xiaomi/sm8250-common/BoardConfigCommon.mk
@@ -31,4 +31,4 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)
 
 # Inherit from the proprietary version
-include vendor/xiaomi/apollon/BoardConfigVendor.mk
+include vendor/xiaomi/apollo/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index 6b096f7..4b4dec7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#  Device Tree for Xiaomi Mi 10T/Mi 10T Pro (apollon)
+#  Device Tree for Xiaomi Mi 10T/Mi 10T Pro (apollo)
 
 ## Spec Sheet
 
diff --git a/device.mk b/device.mk
index 60bc916..d4d6729 100644
--- a/device.mk
+++ b/device.mk
@@ -42,4 +42,4 @@ PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
 
 # Inherit from vendor blobs
-$(call inherit-product, vendor/xiaomi/apollon/apollon-vendor.mk)
+$(call inherit-product, vendor/xiaomi/apollo/apollo-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index 8ed9b6e..d64fa8b 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -38,7 +38,7 @@ fi
 
 set -e
 
-export DEVICE=apollon
+export DEVICE=apollo
 export DEVICE_COMMON=sm8250-common
 export VENDOR=xiaomi
 
diff --git a/lineage_apollon.mk b/lineage_apollo.mk
similarity index 83%
rename from lineage_apollon.mk
rename to lineage_apollo.mk
index 3c5c816..7dcc6c9 100644
--- a/lineage_apollon.mk
+++ b/lineage_apollo.mk
@@ -11,11 +11,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-# Inherit from apollon device
-$(call inherit-product, device/xiaomi/apollon/device.mk)
+# Inherit from apollo device
+$(call inherit-product, device/xiaomi/apollo/device.mk)
 
-PRODUCT_NAME := lineage_apollon
-PRODUCT_DEVICE := apollon
+PRODUCT_NAME := lineage_apollo
+PRODUCT_DEVICE := apollo
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_BRAND := Xiaomi
 PRODUCT_MODEL := Xiaomi Mi 10T
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f3fb405..e72f55d 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -8,7 +8,7 @@
 
 set -e
 
-export DEVICE=apollon
+export DEVICE=apollo
 export DEVICE_COMMON=sm8250-common
 export VENDOR=xiaomi