From 16496719221f91d79d4f60bcd37f919dcc790467 Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Sun, 29 Aug 2021 12:22:31 +0300 Subject: [PATCH] sm6250-common: partial conversion to sm8350 --- Android.mk | 2 +- BoardConfigCommon.mk | 10 +++++----- README.md | 2 +- common.mk | 8 ++++---- fingerprint/Android.bp | 4 ++-- fingerprint/BiometricsFingerprint.h | 2 +- ...iometrics.fingerprint@2.1-service.xiaomi_sm8350.rc} | 2 +- init/Android.bp | 6 +++--- light/Android.bp | 4 ++-- light/Light.cpp | 2 +- ...ndroid.hardware.light@2.0-service.xiaomi_sm8350.rc} | 2 +- light/service.cpp | 2 +- power/Android.bp | 4 ++-- power/Power.cpp | 2 +- ...ndroid.hardware.power@1.3-service.xiaomi_sm8350.rc} | 2 +- power/service.cpp | 2 +- rro_overlays/TetheringOverlay/AndroidManifest.xml | 2 +- rro_overlays/WifiOverlay/AndroidManifest.xml | 2 +- sepolicy/vendor/file_contexts | 4 ++-- 19 files changed, 32 insertions(+), 32 deletions(-) rename fingerprint/{android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc => android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc} (87%) rename light/{android.hardware.light@2.0-service.xiaomi_sm6250.rc => android.hardware.light@2.0-service.xiaomi_sm8350.rc} (96%) rename power/{android.hardware.power@1.3-service.xiaomi_sm6250.rc => android.hardware.power@1.3-service.xiaomi_sm8350.rc} (80%) diff --git a/Android.mk b/Android.mk index 04667b1..5bcd39b 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter curtana excalibur gram joyeuse miatoll,$(TARGET_DEVICE)),) +ifneq ($(filter venus,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) include $(CLEAR_VARS) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index aee7448..c9c489c 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -COMMON_PATH := device/xiaomi/sm6250-common +COMMON_PATH := device/xiaomi/sm8350-common BUILD_BROKEN_DUP_RULES := true @@ -86,7 +86,7 @@ KERNEL_LD := LD=ld.lld TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_CLANG_COMPILE := true TARGET_KERNEL_CONFIG := cust_defconfig -TARGET_KERNEL_SOURCE := kernel/xiaomi/sm6250 +TARGET_KERNEL_SOURCE := kernel/xiaomi/sm8350 BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0 BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom @@ -109,8 +109,8 @@ DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml # Init -TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm6250 -TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm6250 +TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_xiaomi_sm8350 +TARGET_RECOVERY_DEVICE_MODULES := libinit_xiaomi_sm8350 # Media TARGET_USES_ION := true @@ -226,4 +226,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # Inherit proprietary blobs --include vendor/xiaomi/sm6250-common/BoardConfigVendor.mk +-include vendor/xiaomi/sm8350-common/BoardConfigVendor.mk diff --git a/README.md b/README.md index 288c67b..91c9cef 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Copyright (C) 2020 - The LineageOS Project -Common device tree for Xiaomi SM6250 based devices +Common device tree for Xiaomi SM8350 based devices ============== diff --git a/common.mk b/common.mk index 70c85e1..76a92b4 100644 --- a/common.mk +++ b/common.mk @@ -8,7 +8,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit proprietary targets -$(call inherit-product-if-exists, vendor/xiaomi/sm6250-common/sm6250-common-vendor.mk) +$(call inherit-product-if-exists, vendor/xiaomi/sm8350-common/sm8350-common-vendor.mk) # Enable updating of APEXes $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) @@ -152,7 +152,7 @@ PRODUCT_PACKAGES += \ # Fingerprint PRODUCT_PACKAGES += \ - android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250 + android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml @@ -231,7 +231,7 @@ PRODUCT_COPY_FILES += \ # Light PRODUCT_PACKAGES += \ - android.hardware.light@2.0-service.xiaomi_sm6250 + android.hardware.light@2.0-service.xiaomi_sm8350 # LiveDisplay PRODUCT_PACKAGES += \ @@ -278,7 +278,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true # Power PRODUCT_PACKAGES += \ - android.hardware.power@1.3-service.xiaomi_sm6250 + android.hardware.power@1.3-service.xiaomi_sm8350 # RCS PRODUCT_PACKAGES += \ diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index bec9a2b..3902e94 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -14,10 +14,10 @@ // limitations under the License. cc_binary { - name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250", + name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350", relative_install_path: "hw", defaults: ["hidl_defaults"], - init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc"], + init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc"], srcs: ["service.cpp", "BiometricsFingerprint.cpp"], shared_libs: [ "libbase", diff --git a/fingerprint/BiometricsFingerprint.h b/fingerprint/BiometricsFingerprint.h index d8342a2..cbb9bb4 100644 --- a/fingerprint/BiometricsFingerprint.h +++ b/fingerprint/BiometricsFingerprint.h @@ -17,7 +17,7 @@ #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H -#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250" +#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350" #include #include diff --git a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc similarity index 87% rename from fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc rename to fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc index 045bfc2..cfae729 100644 --- a/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250.rc +++ b/fingerprint/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350.rc @@ -1,4 +1,4 @@ -service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm6250 +service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sm8350 class late_start user system group system input uhid diff --git a/init/Android.bp b/init/Android.bp index 7b1c818..a450816 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -15,7 +15,7 @@ // cc_library_static { - name: "libinit_xiaomi_sm6250_common", + name: "libinit_xiaomi_sm8350_common", recovery_available: true, srcs: [ "init_common.cpp" @@ -33,12 +33,12 @@ cc_library_static { } cc_library_static { - name: "libinit_xiaomi_sm6250", + name: "libinit_xiaomi_sm8350", recovery_available: true, srcs: [ "init.cpp" ], whole_static_libs: [ - "libinit_xiaomi_sm6250_common" + "libinit_xiaomi_sm8350_common" ] } diff --git a/light/Android.bp b/light/Android.bp index b6b6629..8380786 100644 --- a/light/Android.bp +++ b/light/Android.bp @@ -15,8 +15,8 @@ cc_binary { relative_install_path: "hw", defaults: ["hidl_defaults"], - name: "android.hardware.light@2.0-service.xiaomi_sm6250", - init_rc: ["android.hardware.light@2.0-service.xiaomi_sm6250.rc"], + name: "android.hardware.light@2.0-service.xiaomi_sm8350", + init_rc: ["android.hardware.light@2.0-service.xiaomi_sm8350.rc"], srcs: ["service.cpp", "Light.cpp"], vendor: true, shared_libs: [ diff --git a/light/Light.cpp b/light/Light.cpp index 9e38c69..e8f8fdf 100644 --- a/light/Light.cpp +++ b/light/Light.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6250" +#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm8350" #include diff --git a/light/android.hardware.light@2.0-service.xiaomi_sm6250.rc b/light/android.hardware.light@2.0-service.xiaomi_sm8350.rc similarity index 96% rename from light/android.hardware.light@2.0-service.xiaomi_sm6250.rc rename to light/android.hardware.light@2.0-service.xiaomi_sm8350.rc index 8675f51..a226104 100644 --- a/light/android.hardware.light@2.0-service.xiaomi_sm6250.rc +++ b/light/android.hardware.light@2.0-service.xiaomi_sm8350.rc @@ -8,7 +8,7 @@ on boot chmod 0644 /sys/class/leds/white/brightness chmod 0644 /sys/class/leds/white/breath -service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm6250 +service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sm8350 interface android.hardware.light@2.0::ILight default class hal user system diff --git a/light/service.cpp b/light/service.cpp index 7e5cf5f..34b2aa8 100644 --- a/light/service.cpp +++ b/light/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm6250" +#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sm8350" #include diff --git a/power/Android.bp b/power/Android.bp index a0c76ea..ef291c8 100644 --- a/power/Android.bp +++ b/power/Android.bp @@ -14,8 +14,8 @@ // limitations under the License. cc_binary { - name: "android.hardware.power@1.3-service.xiaomi_sm6250", - init_rc: ["android.hardware.power@1.3-service.xiaomi_sm6250.rc"], + name: "android.hardware.power@1.3-service.xiaomi_sm8350", + init_rc: ["android.hardware.power@1.3-service.xiaomi_sm8350.rc"], relative_install_path: "hw", proprietary: true, srcs: [ diff --git a/power/Power.cpp b/power/Power.cpp index 3f3c2c0..31b2f5c 100644 --- a/power/Power.cpp +++ b/power/Power.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm6250" +#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm8350" #include diff --git a/power/android.hardware.power@1.3-service.xiaomi_sm6250.rc b/power/android.hardware.power@1.3-service.xiaomi_sm8350.rc similarity index 80% rename from power/android.hardware.power@1.3-service.xiaomi_sm6250.rc rename to power/android.hardware.power@1.3-service.xiaomi_sm8350.rc index 4c63209..6cae61d 100644 --- a/power/android.hardware.power@1.3-service.xiaomi_sm6250.rc +++ b/power/android.hardware.power@1.3-service.xiaomi_sm8350.rc @@ -1,4 +1,4 @@ -service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.3-service.xiaomi_sm6250 +service vendor.power-hal-1-0 /vendor/bin/hw/android.hardware.power@1.3-service.xiaomi_sm8350 class hal user system group system input diff --git a/power/service.cpp b/power/service.cpp index d5d1eb0..d3e2bf2 100644 --- a/power/service.cpp +++ b/power/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm6250" +#define LOG_TAG "android.hardware.power@1.3-service.xiaomi_sm8350" #include diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml index 2b220b6..f903fc9 100644 --- a/rro_overlays/TetheringOverlay/AndroidManifest.xml +++ b/rro_overlays/TetheringOverlay/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlay/AndroidManifest.xml index f252d6b..505609b 100644 --- a/rro_overlays/WifiOverlay/AndroidManifest.xml +++ b/rro_overlays/WifiOverlay/AndroidManifest.xml @@ -15,7 +15,7 @@ --> diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 5dd0560..305dfc9 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -4,7 +4,7 @@ /mnt/vendor/persist/subsys(/.*)? u:object_r:persist_subsys_file:s0 # Fingerprint -/vendor/bin/hw/android\.hardware\.fingerprint@2\.1-service\.xiaomi_sm6250 u:object_r:hal_fingerprint_default_exec:s0 +/vendor/bin/hw/android\.hardware\.fingerprint@2\.1-service\.xiaomi_sm8350 u:object_r:hal_fingerprint_default_exec:s0 # Power HAL -/vendor/bin/hw/android\.hardware\.power@1\.3-service\.xiaomi_sm6250 u:object_r:hal_power_default_exec:s0 +/vendor/bin/hw/android\.hardware\.power@1\.3-service\.xiaomi_sm8350 u:object_r:hal_power_default_exec:s0