From 104f3d6f68e8c98bd4b78854dd08d8f6d0800579 Mon Sep 17 00:00:00 2001 From: Sebaubuntu Date: Sun, 27 Jun 2021 11:16:27 +0200 Subject: [PATCH] sm7250-common: vibrator: Rebrand to Xiaomi SM7250 Signed-off-by: xSylla --- lito.mk | 2 +- sepolicy/vendor/file_contexts | 3 +++ vibrator/Android.bp | 10 +++++----- vibrator/Vibrator.cpp | 2 +- vibrator/service.cpp | 2 +- vibrator/vendor.qti.hardware.vibrator.service.rc | 4 ---- ...vendor.qti.hardware.vibrator.service.xiaomi_lito.rc | 4 ++++ ...ndor.qti.hardware.vibrator.service.xiaomi_lito.xml} | 0 8 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 vibrator/vendor.qti.hardware.vibrator.service.rc create mode 100644 vibrator/vendor.qti.hardware.vibrator.service.xiaomi_lito.rc rename vibrator/{vendor.qti.hardware.vibrator.service.xml => vendor.qti.hardware.vibrator.service.xiaomi_lito.xml} (100%) diff --git a/lito.mk b/lito.mk index dc787b2..efd29f1 100644 --- a/lito.mk +++ b/lito.mk @@ -401,7 +401,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Vibrator PRODUCT_PACKAGES += \ - vendor.qti.hardware.vibrator.service + vendor.qti.hardware.vibrator.service.xiaomi_lito PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index bc3966e..1e975cb 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -85,6 +85,9 @@ # USB /vendor/bin/init\.mi\.usb\.sh u:object_r:vendor_qti_init_shell_exec:s0 +# Vibrator +/vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.xiaomi_lito u:object_r:hal_vibrator_default_exec:s0 + # WiFi /vendor/bin/nv_mac u:object_r:wcnss_service_exec:s0 /data/vendor/mac_addr(/.*)? u:object_r:wifi_vendor_data_file:s0 diff --git a/vibrator/Android.bp b/vibrator/Android.bp index ff62eb6..8ab174d 100644 --- 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", + name: "vendor.qti.hardware.vibrator.impl.xiaomi_lito", vendor: true, cflags: Common_CFlags, srcs: [ @@ -20,12 +20,12 @@ cc_library_shared { } cc_binary { - name: "vendor.qti.hardware.vibrator.service", + name: "vendor.qti.hardware.vibrator.service.xiaomi_lito", vendor: true, relative_install_path: "hw", - init_rc: ["vendor.qti.hardware.vibrator.service.rc"], + init_rc: ["vendor.qti.hardware.vibrator.service.xiaomi_lito.rc"], vintf_fragments: [ - "vendor.qti.hardware.vibrator.service.xml", + "vendor.qti.hardware.vibrator.service.xiaomi_lito.xml", ], cflags: Common_CFlags, srcs: [ @@ -37,6 +37,6 @@ cc_binary { "libbase", "libbinder_ndk", "android.hardware.vibrator-ndk_platform", - "vendor.qti.hardware.vibrator.impl", + "vendor.qti.hardware.vibrator.impl.xiaomi_lito", ], } diff --git a/vibrator/Vibrator.cpp b/vibrator/Vibrator.cpp index c7df267..4ce86e7 100644 --- 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" +#define LOG_TAG "vendor.qti.vibrator.xiaomi_lito" #include #include diff --git a/vibrator/service.cpp b/vibrator/service.cpp index 4fe3118..ebe1c9f 100644 --- 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" +#define LOG_TAG "vendor.qti.hardware.vibrator.service.xiaomi_lito" #include #include diff --git a/vibrator/vendor.qti.hardware.vibrator.service.rc b/vibrator/vendor.qti.hardware.vibrator.service.rc deleted file mode 100644 index ffa8ce9..0000000 --- a/vibrator/vendor.qti.hardware.vibrator.service.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.qti.vibrator /vendor/bin/hw/vendor.qti.hardware.vibrator.service - class hal - user system - group system input diff --git a/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_lito.rc b/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_lito.rc new file mode 100644 index 0000000..0908caf --- /dev/null +++ b/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_lito.rc @@ -0,0 +1,4 @@ +service vendor.qti.vibrator.xiaomi_lito /vendor/bin/hw/vendor.qti.hardware.vibrator.service.xiaomi_lito + class hal + user system + group system input diff --git a/vibrator/vendor.qti.hardware.vibrator.service.xml b/vibrator/vendor.qti.hardware.vibrator.service.xiaomi_lito.xml similarity index 100% rename from vibrator/vendor.qti.hardware.vibrator.service.xml rename to vibrator/vendor.qti.hardware.vibrator.service.xiaomi_lito.xml