apollo: Rename apollon to apollo

Fuutao · Jan 9, 2023 · 6f38d3b · 6f38d3b
1 parent aeff394
commit 6f38d3b
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 35 deletions.
diff --git a/Android.mk b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),apollon)
+ifeq ($(TARGET_DEVICE),apollo)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
@@ -5,9 +5,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/kscope_apollon.mk
+    $(LOCAL_DIR)/kscope_apollo.mk
 
 COMMON_LUNCH_CHOICES := \
-    kscope_apollon-user \
-    kscope_apollon-userdebug \
-    kscope_apollon-eng
+    kscope_apollo-user \
+    kscope_apollo-userdebug \
+    kscope_apollo-eng
diff --git 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
 
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
 BUILD_BROKEN_DUP_RULES := true
@@ -74,8 +74,8 @@ DEVICE_MATRIX_FILE += $(DEVICE_PATH)/compatibility_matrix.xml
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
 
 # Init
-TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_apollon
-TARGET_RECOVERY_DEVICE_MODULES := libinit_apollon
+TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_apollo
+TARGET_RECOVERY_DEVICE_MODULES := libinit_apollo
 
 # Kernel
 BOARD_BOOT_HEADER_VERSION := 2
@@ -91,7 +91,7 @@ TARGET_KERNEL_CONFIG := vendor/apollo_defconfig
 TARGET_KERNEL_SOURCE := kernel/xiaomi/sm8250
 
 # OTA assert
-TARGET_OTA_ASSERT_DEVICE := apollon,apollo,apollopro
+TARGET_OTA_ASSERT_DEVICE := apollo,apollopro
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
@@ -200,4 +200,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 # Inherit the proprietary files
-include vendor/xiaomi/apollon/BoardConfigVendor.mk
+include vendor/xiaomi/apollo/BoardConfigVendor.mk
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-#  Device Tree for Xiaomi Redmi K30S Ultra/Mi 10T/Mi 10T Pro (apollon)
+#  Device Tree for Xiaomi Redmi K30S Ultra/Mi 10T/Mi 10T Pro (apollo)
 
 ## Spec Sheet
 

diff --git a/device.mk b/device.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PATH := device/xiaomi/apollon
+DEVICE_PATH := device/xiaomi/apollo
 
 PRODUCT_SHIPPING_API_LEVEL := 29
 
@@ -422,7 +422,7 @@ PRODUCT_PACKAGES += \
 
 # Vibrator
 PRODUCT_PACKAGES += \
-    vendor.qti.hardware.vibrator.service.apollon
+    vendor.qti.hardware.vibrator.service.apollo
 
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml
@@ -457,4 +457,4 @@ PRODUCT_BOOT_JARS += \
 $(call inherit-product, vendor/xiaomi-firmware/apollo/firmware.mk)
 
 # Inherit the proprietary files
-$(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
@@ -8,7 +8,7 @@
 
 set -e
 
-DEVICE=apollon
+DEVICE=apollo
 VENDOR=xiaomi
 
 # Load extract_utils and do some sanity checks

diff --git a/kscope_apollon.mk → kscope_apollo.mk b/kscope_apollon.mk → kscope_apollo.mk
@@ -11,11 +11,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit some common Kaleidoscope stuff.
 $(call inherit-product, vendor/kscope/target/product/mobile.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 := kscope_apollon
-PRODUCT_DEVICE := apollon
+PRODUCT_NAME := kscope_apollo
+PRODUCT_DEVICE := apollo
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_BRAND := Xiaomi
 PRODUCT_MODEL := Xiaomi Mi 10T

diff --git a/libinit/Android.bp b/libinit/Android.bp
@@ -5,8 +5,8 @@
 //
 
 cc_library_static {
-    name: "libinit_apollon",
-    srcs: ["init_apollon.cpp"],
+    name: "libinit_apollo",
+    srcs: ["init_apollo.cpp"],
     whole_static_libs: ["libbase"],
     include_dirs: ["system/core/init"],
     recovery_available: true,

diff --git a/libinit/init_apollon.cpp → libinit/init_apollo.cpp b/libinit/init_apollon.cpp → libinit/init_apollo.cpp
diff --git a/rro_overlays/WifiResources/AndroidManifest.xml b/rro_overlays/WifiResources/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.overlay.apollon"
+    package="com.android.wifi.resources.overlay.apollo"
     android:versionCode="1"
     android:versionName="1.0">
     <application android:hasCode="false" />

diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
@@ -94,7 +94,7 @@
 /vendor/bin/init\.mi\.usb\.sh                                           u:object_r:vendor_qti_init_shell_exec:s0
 
 # Vibrator
-/vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.apollon        u:object_r:hal_vibrator_default_exec:s0
+/vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.apollo        u:object_r:hal_vibrator_default_exec:s0
 
 # WiFi
 /vendor/bin/nv_mac                                                      u:object_r:vendor_wcnss_service_exec:s0

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
@@ -8,7 +8,7 @@
 
 set -e
 
-DEVICE=apollon
+DEVICE=apollo
 VENDOR=xiaomi
 
 # Load extract_utils and do some sanity checks

diff --git a/vibrator/Android.bp b/vibrator/Android.bp
@@ -2,7 +2,7 @@ Common_CFlags = ["-Wall"]
 Common_CFlags += ["-Werror"]
 
 cc_library_shared {
-    name: "vendor.qti.hardware.vibrator.impl.apollon",
+    name: "vendor.qti.hardware.vibrator.impl.apollo",
     vendor: true,
     cflags: Common_CFlags,
     srcs: [
@@ -20,12 +20,12 @@ cc_library_shared {
 }
 
 cc_binary {
-    name: "vendor.qti.hardware.vibrator.service.apollon",
+    name: "vendor.qti.hardware.vibrator.service.apollo",
     vendor: true,
     relative_install_path: "hw",
-    init_rc: ["vendor.qti.hardware.vibrator.service.apollon.rc"],
+    init_rc: ["vendor.qti.hardware.vibrator.service.apollo.rc"],
     vintf_fragments: [
-        "vendor.qti.hardware.vibrator.service.apollon.xml",
+        "vendor.qti.hardware.vibrator.service.apollo.xml",
     ],
     cflags: Common_CFlags,
     srcs: [
@@ -37,6 +37,6 @@ cc_binary {
         "libbase",
         "libbinder_ndk",
         "android.hardware.vibrator-V1-ndk_platform",
-        "vendor.qti.hardware.vibrator.impl.apollon",
+        "vendor.qti.hardware.vibrator.impl.apollo",
     ],
 }
diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define LOG_TAG "vendor.qti.vibrator.apollon"
+#define LOG_TAG "vendor.qti.vibrator.apollo"
 
 #include <cutils/properties.h>
 #include <dirent.h>

diff --git a/vibrator/service.cpp b/vibrator/service.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define LOG_TAG "vendor.qti.hardware.vibrator.service.apollon"
+#define LOG_TAG "vendor.qti.hardware.vibrator.service.apollo"
 
 #include <android-base/logging.h>
 #include <android/binder_manager.h>

diff --git a/vibrator/vendor.qti.hardware.vibrator.service.apollo.rc b/vibrator/vendor.qti.hardware.vibrator.service.apollo.rc
@@ -0,0 +1,4 @@
+service vendor.qti.vibrator.apollo /vendor/bin/hw/vendor.qti.hardware.vibrator.service.apollo
+    class hal
+    user system
+    group system input
diff --git a/...qti.hardware.vibrator.service.apollon.xml → ....qti.hardware.vibrator.service.apollo.xml b/...qti.hardware.vibrator.service.apollon.xml → ....qti.hardware.vibrator.service.apollo.xml
diff --git a/vibrator/vendor.qti.hardware.vibrator.service.apollon.rc b/vibrator/vendor.qti.hardware.vibrator.service.apollon.rc