diff --git a/Android.bp b/Android.bp index fe148d9..f1245df 100644 --- a/Android.bp +++ b/Android.bp @@ -2829,24 +2829,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.xiaomi.hardware.citsensorservice@1.1-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so"], - shared_libs: ["libhidlbase", "libhidltransport", "libutils", "liblog", "libcutils", "libhardware", "libbase", "libssccalapi", "vendor.xiaomi.hardware.citsensorservice@1.0", "vendor.xiaomi.hardware.citsensorservice@1.1", "android.frameworks.sensorservice@1.0", "android.hardware.graphics.allocator@4.0", "android.hardware.graphics.mapper@4.0", "android.hardware.graphics.common@1.2", "vendor.display.config@2.0", "libqdutils", "vendor.qti.hardware.display.composer@3.0", "vendor.qti.hardware.display.allocator@4.0", "vendor.qti.hardware.display.mapper@4.0", "vendor.qti.hardware.display.mapperextensions@1.1", "libdisplayconfig.qti", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "jcos_nq_client", owner: "xiaomi", @@ -6625,40 +6607,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.xiaomi.hardware.citsensorservice@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.0.so"], - shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.xiaomi.hardware.citsensorservice@1.1", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.1.so"], - shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "vendor.xiaomi.hardware.citsensorservice@1.0", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmmosal", owner: "xiaomi", @@ -7639,15 +7587,6 @@ prebuilt_etc_xml { soc_specific: true, } -prebuilt_etc_xml { - name: "vendor.xiaomi.hardware.citsensorservice@1.1-service.xml", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.hardware.citsensorservice@1.1-service.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, -} - cc_prebuilt_binary { name: "ATFWD-daemon", owner: "xiaomi", @@ -8072,24 +8011,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "vendor.xiaomi.hardware.citsensorservice@1.1-service", - owner: "xiaomi", - target: { - android_arm64: { - srcs: ["proprietary/vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service"], - shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libssccalapi", "libhidlbase", "libhidltransport", "vendor.xiaomi.hardware.citsensorservice@1.0", "vendor.xiaomi.hardware.citsensorservice@1.1", "android.frameworks.sensorservice@1.0", "libc++", "libc", "libm", "libdl", ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - cc_prebuilt_binary { name: "ims_rtp_daemon", owner: "xiaomi", diff --git a/proprietary/vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service b/proprietary/vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service deleted file mode 100755 index c483ac3..0000000 Binary files a/proprietary/vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service and /dev/null differ diff --git a/proprietary/vendor/etc/init/vendor.xiaomi.hardware.citsensorservice@1.1-service.rc b/proprietary/vendor/etc/init/vendor.xiaomi.hardware.citsensorservice@1.1-service.rc deleted file mode 100644 index c497292..0000000 --- a/proprietary/vendor/etc/init/vendor.xiaomi.hardware.citsensorservice@1.1-service.rc +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2017 Xiaomi Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Xiaomi Technologies, Inc. -# -service citsensor-hal-1-1 /vendor/bin/hw/vendor.xiaomi.hardware.citsensorservice@1.1-service - class late_start - user system - group system input diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.hardware.citsensorservice@1.1-service.xml b/proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.hardware.citsensorservice@1.1-service.xml deleted file mode 100644 index d991d66..0000000 --- a/proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.hardware.citsensorservice@1.1-service.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - vendor.xiaomi.hardware.citsensorservice - hwbinder - 1.1 - - ICitSensorService - default - - - diff --git a/proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so b/proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so deleted file mode 100644 index bdf5b9c..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.citsensorservice@1.1-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.0.so b/proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.0.so deleted file mode 100644 index a9cfa29..0000000 Binary files a/proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.1.so b/proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.1.so deleted file mode 100644 index 1ee5bf1..0000000 Binary files a/proprietary/vendor/lib64/vendor.xiaomi.hardware.citsensorservice@1.1.so and /dev/null differ diff --git a/sm8350-common-vendor.mk b/sm8350-common-vendor.mk index d62dd98..4e72808 100644 --- a/sm8350-common-vendor.mk +++ b/sm8350-common-vendor.mk @@ -94,7 +94,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \ vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.secure_element@1.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.secure_element@1.2-service.rc \ vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \ - vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.xiaomi.hardware.citsensorservice@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.citsensorservice@1.1-service.rc \ vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.hardware.mlipay@1.1-service.rc \ vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \ vendor/xiaomi/sm8350-common/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \ @@ -290,7 +289,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.capabilityconfigstore@1.0-impl \ vendor.qti.hardware.qteeconnector@1.0-impl \ vendor.qti.hardware.soter@1.0-impl \ - vendor.xiaomi.hardware.citsensorservice@1.1-impl \ jcos_nq_client \ lib-imscommon \ lib-imsdpl \ @@ -513,8 +511,6 @@ PRODUCT_PACKAGES += \ vendor.qti.imsrtpservice@3.0-vendor \ vendor.qti.latency@2.0 \ vendor.qti.latency@2.1 \ - vendor.xiaomi.hardware.citsensorservice@1.0 \ - vendor.xiaomi.hardware.citsensorservice@1.1 \ libmmosal \ libmmparser_lite \ libmmrtpdecoder \ @@ -579,7 +575,6 @@ PRODUCT_PACKAGES += \ manifest_android.hardware.drm@1.3-service.widevine.xml \ manifest_vendor.xiaomi.hardware.mlipay.xml \ vendor.qti.gnss@4.0-service.xml \ - vendor.xiaomi.hardware.citsensorservice@1.1-service.xml \ ATFWD-daemon \ adpl \ adsprpcd \ @@ -604,7 +599,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.soter@1.0-service \ vendor.qti.media.c2@1.0-service \ vendor.qti.secure_element@1.2-service \ - vendor.xiaomi.hardware.citsensorservice@1.1-service \ ims_rtp_daemon \ imsdaemon \ init.qti.qcv \