From eb43dafe4f10f57f0aa86341da00f888f955a4c3 Mon Sep 17 00:00:00 2001 From: Ramii Ahmed Date: Sat, 19 Jun 2021 21:14:22 +0000 Subject: [PATCH] apollon: Initiate rebrand due to conflicts with amazon_apollo this device will be called apollon from now on Change-Id: Iaf608cacca1ea8868e545bd85884ffbf4587e5cd --- Android.mk | 2 +- AndroidProducts.mk | 8 ++++---- BoardConfig.mk | 4 ++-- README.md | 2 +- device.mk | 2 +- extract-files.sh | 2 +- lineage_apollo.mk => lineage_apollon.mk | 8 ++++---- setup-makefiles.sh | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename lineage_apollo.mk => lineage_apollon.mk (83%) diff --git a/Android.mk b/Android.mk index c40f0cf..0f09ad3 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),apollo) +ifeq ($(TARGET_DEVICE),apollon) include $(call all-makefiles-under,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index d0a415d..599653e 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,9 +5,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_apollo.mk + $(LOCAL_DIR)/lineage_apollon.mk COMMON_LUNCH_CHOICES := \ - lineage_apollo-user \ - lineage_apollo-userdebug \ - lineage_apollo-eng + lineage_apollon-user \ + lineage_apollon-userdebug \ + lineage_apollon-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 2230718..88357e8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/xiaomi/apollo +DEVICE_PATH := device/xiaomi/apollon # Inherit from sm8250-common include device/xiaomi/sm8250-common/BoardConfigCommon.mk @@ -21,4 +21,4 @@ TARGET_SCREEN_DENSITY := 440 TARGET_KERNEL_CONFIG := vendor/apollo_defconfig # Inherit from the proprietary version -include vendor/xiaomi/apollo/BoardConfigVendor.mk +include vendor/xiaomi/apollon/BoardConfigVendor.mk diff --git a/README.md b/README.md index 4b4dec7..6b096f7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Device Tree for Xiaomi Mi 10T/Mi 10T Pro (apollo) +# Device Tree for Xiaomi Mi 10T/Mi 10T Pro (apollon) ## Spec Sheet diff --git a/device.mk b/device.mk index 95ead37..09b095d 100644 --- a/device.mk +++ b/device.mk @@ -30,4 +30,4 @@ PRODUCT_SHIPPING_API_LEVEL := 29 $(call inherit-product, device/xiaomi/sm8250-common/kona.mk) # Inherit from vendor blobs -$(call inherit-product, vendor/xiaomi/apollo/apollo-vendor.mk) +$(call inherit-product, vendor/xiaomi/apollon/apollon-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index bbf360b..0e85c79 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -52,7 +52,7 @@ fi set -e -export DEVICE=apollo +export DEVICE=apollon export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi diff --git a/lineage_apollo.mk b/lineage_apollon.mk similarity index 83% rename from lineage_apollo.mk rename to lineage_apollon.mk index 3bcc49c..216647a 100644 --- a/lineage_apollo.mk +++ b/lineage_apollon.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 apollo device -$(call inherit-product, device/xiaomi/apollo/device.mk) +# Inherit from apollon device +$(call inherit-product, device/xiaomi/apollon/device.mk) -PRODUCT_NAME := lineage_apollo -PRODUCT_DEVICE := apollo +PRODUCT_NAME := lineage_apollon +PRODUCT_DEVICE := apollon PRODUCT_MANUFACTURER := Xiaomi PRODUCT_BRAND := Xiaomi PRODUCT_MODEL := Xiaomi Mi 10T diff --git a/setup-makefiles.sh b/setup-makefiles.sh index e72f55d..f3fb405 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,7 +8,7 @@ set -e -export DEVICE=apollo +export DEVICE=apollon export DEVICE_COMMON=sm8250-common export VENDOR=xiaomi