diff --git a/Android.bp b/Android.bp index 31b0cfc..633da95 100644 --- a/Android.bp +++ b/Android.bp @@ -97,12 +97,3 @@ prebuilt_etc_xml { soc_specific: true, } -prebuilt_etc_xml { - name: "vendor.xiaomi.sensor.citsensorservice@2.0-service", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.sensor.citsensorservice@2.0-service.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, -} - diff --git a/marble-vendor.mk b/marble-vendor.mk index aecc3e3..f05e702 100644 --- a/marble-vendor.mk +++ b/marble-vendor.mk @@ -16,7 +16,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/marble/proprietary/vendor/bin/hw/vendor.qti.camera.provider@2.7-service_64:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.camera.provider@2.7-service_64 \ vendor/xiaomi/marble/proprietary/vendor/bin/hw/vendor.qti.hardware.AGMIPC@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.AGMIPC@1.0-service \ vendor/xiaomi/marble/proprietary/vendor/bin/hw/vendor.xiaomi.hardware.quickcamera@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.xiaomi.hardware.quickcamera@1.0-service \ - vendor/xiaomi/marble/proprietary/vendor/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service \ vendor/xiaomi/marble/proprietary/vendor/etc/acdbdata/Forte/Forte_acdb_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_acdb_cal.acdb \ vendor/xiaomi/marble/proprietary/vendor/etc/acdbdata/Forte/Forte_workspaceFileXml.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Forte/Forte_workspaceFileXml.qwsp \ vendor/xiaomi/marble/proprietary/vendor/etc/acdbdata/IDP_UPD/IDP_UPD_acdb_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP_UPD/IDP_UPD_acdb_cal.acdb \ @@ -432,7 +431,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/marble/proprietary/vendor/etc/init/hw/init.batterysecret.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.batterysecret.rc \ vendor/xiaomi/marble/proprietary/vendor/etc/init/vendor.qti.camera.provider@2.7-service_64.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.camera.provider@2.7-service_64.rc \ vendor/xiaomi/marble/proprietary/vendor/etc/init/vendor.qti.hardware.AGMIPC@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.AGMIPC@1.0-service.rc \ - vendor/xiaomi/marble/proprietary/vendor/etc/init/vendor.xiaomi.sensor.citsensorservice@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.xiaomi.sensor.citsensorservice@2.0-service.rc \ vendor/xiaomi/marble/proprietary/vendor/etc/kvh2xml.xml:$(TARGET_COPY_OUT_VENDOR)/etc/kvh2xml.xml \ vendor/xiaomi/marble/proprietary/vendor/etc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \ vendor/xiaomi/marble/proprietary/vendor/etc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \ @@ -789,8 +787,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/marble/proprietary/vendor/lib/vendor.qti.hardware.pal@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.pal@1.0-impl.so \ vendor/xiaomi/marble/proprietary/vendor/lib/vendor.qti.hardware.pal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.pal@1.0.so \ vendor/xiaomi/marble/proprietary/vendor/lib/vendor.xiaomi.hardware.quickcamera@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.xiaomi.hardware.quickcamera@1.0.so \ - vendor/xiaomi/marble/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.xiaomi.sensor.citsensorservice@1.1.so \ - vendor/xiaomi/marble/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.xiaomi.sensor.citsensorservice@2.0.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/camera/com.qti.actuator.marble_ofilm_ov64b40_gt9764_wide_actuator.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.actuator.marble_ofilm_ov64b40_gt9764_wide_actuator.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/camera/com.qti.eeprom.marble_ofilm_gc02m1_p24c64f_macro_i_eeprom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.marble_ofilm_gc02m1_p24c64f_macro_i_eeprom.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/camera/com.qti.eeprom.marble_ofilm_imx355_gt24p64e_ultra_i_eeprom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.marble_ofilm_imx355_gt24p64e_ultra_i_eeprom.so \ @@ -1002,7 +998,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/marble/proprietary/vendor/lib64/hw/fingerprint.goodix.default.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.goodix.default.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/hw/gyro_fusion_interface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/gyro_fusion_interface.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.quickcamera@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.xiaomi.hardware.quickcamera@1.0-impl.so \ - vendor/xiaomi/marble/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/libAF.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libAF.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/libMiMotion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMiMotion.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/libQnnHtpAltPrepV69Stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQnnHtpAltPrepV69Stub.so \ @@ -1181,14 +1176,11 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.hardware.bgservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.bgservice@1.0.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.hardware.campostproc@1.0-service-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.campostproc@1.0-service-impl.so \ vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.campostproc@1.0.so \ - vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.hardware.quickcamera@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.quickcamera@1.0.so \ - vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.sensor.citsensorservice@1.1.so \ - vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@2.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.sensor.citsensorservice@2.0.so + vendor/xiaomi/marble/proprietary/vendor/lib64/vendor.xiaomi.hardware.quickcamera@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.quickcamera@1.0.so PRODUCT_PACKAGES += \ libagm \ libar-pal \ libssccalapi@2.0 \ vendor.qti.hardware.AGMIPC@1.0-impl \ - vendor.xiaomi.hardware.quickcamera@1.0-service \ - vendor.xiaomi.sensor.citsensorservice@2.0-service + vendor.xiaomi.hardware.quickcamera@1.0-service diff --git a/proprietary/vendor/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service b/proprietary/vendor/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service deleted file mode 100644 index 4c54169..0000000 Binary files a/proprietary/vendor/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service and /dev/null differ diff --git a/proprietary/vendor/etc/init/vendor.xiaomi.sensor.citsensorservice@2.0-service.rc b/proprietary/vendor/etc/init/vendor.xiaomi.sensor.citsensorservice@2.0-service.rc deleted file mode 100644 index b5e3d26..0000000 --- a/proprietary/vendor/etc/init/vendor.xiaomi.sensor.citsensorservice@2.0-service.rc +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2017 Xiaomi Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Xiaomi Technologies, Inc. -# - -on boot - chown system system /dev/xiaomi_hall - chmod 0664 /dev/xiaomi_hall - -service citsensor-hal-2-0 /vendor/bin/hw/vendor.xiaomi.sensor.citsensorservice@2.0-service - class late_start - user system - group system input diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.sensor.citsensorservice@2.0-service.xml b/proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.sensor.citsensorservice@2.0-service.xml deleted file mode 100644 index 908d67b..0000000 --- a/proprietary/vendor/etc/vintf/manifest/vendor.xiaomi.sensor.citsensorservice@2.0-service.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - vendor.xiaomi.sensor.citsensorservice - hwbinder - 2.0 - - ICitSensorService - default - - - - vendor.xiaomi.sensor.citsensorservice - hwbinder - 1.1 - - ICitSensorService - default - - - diff --git a/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@1.1.so b/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@1.1.so deleted file mode 100644 index 44a88ea..0000000 Binary files a/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@1.1.so and /dev/null differ diff --git a/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@2.0.so b/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@2.0.so deleted file mode 100644 index 0072d1a..0000000 Binary files a/proprietary/vendor/lib/vendor.xiaomi.sensor.citsensorservice@2.0.so and /dev/null differ diff --git a/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so b/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so deleted file mode 100644 index 8b2ae67..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.xiaomi.sensor.citsensorservice@2.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@1.1.so b/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@1.1.so deleted file mode 100644 index 4e20ac7..0000000 Binary files a/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@1.1.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@2.0.so b/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@2.0.so deleted file mode 100644 index f148858..0000000 Binary files a/proprietary/vendor/lib64/vendor.xiaomi.sensor.citsensorservice@2.0.so and /dev/null differ