From 943282d4671b335ea92c3bf8a1df7f56433a9487 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Wed, 27 Mar 2019 14:04:37 +0800 Subject: [PATCH] msm8996-common: Remove ANT+ * ANT+ HIDL implementation was removed from stock Pie BT stack * The previous qualcomm-uart implementation is not compatible with QTI BT HAL so there's no way to keep it Change-Id: I33547eb7de5e77120f4acfc174ab10566070810d --- BoardConfigCommon.mk | 3 --- manifest.xml | 9 --------- msm8996.mk | 6 ------ proprietary-files.txt | 10 ---------- 4 files changed, 28 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 26f11fd9e..39779fd28 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -62,9 +62,6 @@ BOARD_VNDK_VERSION := current PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_VENDOR_MOVE_ENABLED := true -# ANT+ -BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" - # Audio AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true diff --git a/manifest.xml b/manifest.xml index 0e736ce0a..dd051a79c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -327,15 +327,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. default - - com.qualcomm.qti.ant - hwbinder - 1.0 - - IAntHci - default - - com.qualcomm.qti.dpm.api hwbinder diff --git a/msm8996.mk b/msm8996.mk index cba163e07..07b7eda63 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -45,7 +45,6 @@ TARGET_BOOTANIMATION_HALF_RES := true # Permissions PRODUCT_COPY_FILES += \ - external/ant-wireless/antradio-library/com.dsi.ant.antradio_library.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.dsi.ant.antradio_library.xml \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ @@ -90,11 +89,6 @@ PRODUCT_CHARACTERISTICS := nosdcard PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt -# ANT+ -PRODUCT_PACKAGES += \ - AntHalService \ - com.dsi.ant.antradio_library - # Audio PRODUCT_PACKAGES += \ android.hardware.audio@4.0-impl \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 14a16e810..f62069864 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -69,16 +69,6 @@ vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so|00015214071f7e8cdf5c9 vendor/lib64/libbtnv.so|b5fc1d89ca68a5e39984b375ed308eb040007c73 vendor/lib64/libbt-hidlclient.so|56874d3b5e5981fa047a544a9ba8425de0228268 -# Bluetooth ANT+ - from lavender - PKQ1.180904.001 -lib64/com.qualcomm.qti.ant@1.0.so|3a19c81d66ef1190d0b2f361420d5cbf707cc600 --lib64/libantradio.so|456b6b2fda1450c852ad0b766143b9cf3c61cde0 -lib/com.qualcomm.qti.ant@1.0.so|a31ea1978c494b5723fdf37bca09f36a02cd168e --lib/libantradio.so|d1f41ee14d4cd7b3a306a628bca5cc9e19027201 - -# Bluetooth ANT+ (vendor) -vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so -vendor/lib64/com.qualcomm.qti.ant@1.0_vendor.so - # Bluetooth (shared dependencies) - from LA.UM.7.5.r1-04800-8x96.0 lib64/vendor.qti.hardware.fm@1.0.so|1d96a8b1f94098c73bae36d36dbaa32aad304a96 vendor/lib64/vendor.qti.hardware.fm@1.0.so|1d96a8b1f94098c73bae36d36dbaa32aad304a96