diff --git a/Android.bp b/Android.bp index 6f51559..02813db 100644 --- a/Android.bp +++ b/Android.bp @@ -2524,42 +2524,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "android.hardware.bluetooth@1.0-impl-qti", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libutils", - "libdiag", - "libqmiservices", - "libqmi_cci", - "libbtnv", - "android.hardware.bluetooth@1.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "android.hardware.keymaster@3.0-impl-qti", owner: "xiaomi", @@ -2751,100 +2715,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.bluetooth_sar@1.0-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libutils", - "liblog", - "libhwbinder", - "libbase", - "libcutils", - "libhardware", - "vendor.qti.hardware.bluetooth_sar@1.0", - "android.hardware.bluetooth@1.0", - "android.hardware.bluetooth@1.0-impl-qti", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.btconfigstore@1.0-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so", - ], - shared_libs: [ - "libbase", - "libcutils", - "libhidlbase", - "libhidltransport", - "liblog", - "libhwbinder", - "libutils", - "vendor.qti.hardware.btconfigstore@1.0", - "android.hardware.bluetooth@1.0-impl-qti", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libbtnv", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libbtnv.so", - ], - shared_libs: [ - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libdiagjni", owner: "xiaomi", @@ -3014,36 +2884,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.bluetooth_sar@1.0", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - prebuilt_rfsa { name: "dirac_resource", filename: "dirac_resource.dar", @@ -3123,41 +2963,6 @@ sh_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "android.hardware.bluetooth@1.0-service-qti", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti", - ], - shared_libs: [ - "liblog", - "libcutils", - "libutils", - "libhwbinder", - "libhidlbase", - "libhidltransport", - "android.hardware.bluetooth@1.0", - "vendor.qti.hardware.bluetooth_sar@1.0", - "vendor.qti.hardware.btconfigstore@1.0", - "libqti_vndfwk_detect", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - cc_prebuilt_binary { name: "android.hardware.keymaster@3.0-service-qti", owner: "xiaomi", diff --git a/dipper-vendor.mk b/dipper-vendor.mk index 5c64e95..9fda93d 100644 --- a/dipper-vendor.mk +++ b/dipper-vendor.mk @@ -42,7 +42,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/dipper/proprietary/vendor/etc/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf \ vendor/xiaomi/dipper/proprietary/vendor/etc/gpsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpsconfig.xml \ vendor/xiaomi/dipper/proprietary/vendor/etc/hdr_config.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/hdr_config.cfg \ - vendor/xiaomi/dipper/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \ vendor/xiaomi/dipper/proprietary/vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@3.0-service-qti.rc \ vendor/xiaomi/dipper/proprietary/vendor/etc/init/vendor.qti.secure_element@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.secure_element@1.0-service.rc \ vendor/xiaomi/dipper/proprietary/vendor/etc/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lhd.conf \ @@ -224,30 +223,24 @@ PRODUCT_PACKAGES += \ libtonemapalgo \ libvidhance \ android.hardware.gnss@2.0-impl-xiaomi \ - android.hardware.bluetooth@1.0-impl-qti \ android.hardware.keymaster@3.0-impl-qti \ android.hardware.secure_element@1.0-impl \ fingerprint.fpc.sdm845 \ fingerprint.goodix.sdm845 \ flp.brcm \ gps.brcm \ - vendor.qti.hardware.bluetooth_sar@1.0-impl \ - vendor.qti.hardware.btconfigstore@1.0-impl \ - libbtnv \ libdiagjni \ libgf_ca \ libgf_hal \ libgps.utils \ libremosaiclib \ sensors.ssc \ - vendor.qti.hardware.bluetooth_sar@1.0 \ dirac_resource \ libSuperSensor_skel \ libarcsoft_dualcam_refocus_skel \ misound_res \ glgps \ gps.cer \ - android.hardware.bluetooth@1.0-service-qti \ android.hardware.keymaster@3.0-service-qti \ vendor.qti.secure_element@1.0-service \ ignss_2_0 \ diff --git a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti deleted file mode 100755 index 2e6de50..0000000 Binary files a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and /dev/null differ diff --git a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc deleted file mode 100644 index 22b71f4..0000000 --- a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc +++ /dev/null @@ -1,5 +0,0 @@ -service vendor.bluetooth-1-0-qti /vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti - class hal - user bluetooth - group bluetooth system wakelock oem_2901 - capabilities BLOCK_SUSPEND NET_ADMIN diff --git a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so deleted file mode 100644 index 9771d63..0000000 Binary files a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and /dev/null differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so deleted file mode 100644 index 5f014ee..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so deleted file mode 100644 index 101655c..0000000 Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libbtnv.so b/proprietary/vendor/lib64/libbtnv.so deleted file mode 100644 index a1c7bf4..0000000 Binary files a/proprietary/vendor/lib64/libbtnv.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so deleted file mode 100644 index a19b64c..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so and /dev/null differ