aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2018-04-12 11:13:39 +0100
committerDavide Garberi <dade.garberi@gmail.com>2018-09-13 15:22:10 +0200
commitba4fac83a976e2cce0181e993e0307246e084f7d (patch)
treedf119e4bb6c2a603db221683d60f16dcfe0bd9d4
parentb10bfe04d21a57e3f34eeadae23bf4ef41d0fed1 (diff)
msm8996-common: Switch to HIDL ANT+ HAL
Change-Id: I0e0252b6e2c7e3e7da1e8508f010b7e6c2bfd128 Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
-rw-r--r--BoardConfigCommon.mk2
-rw-r--r--manifest.xml9
-rwxr-xr-xmsm8996.mk3
-rw-r--r--proprietary-files.txt9
4 files changed, 19 insertions, 4 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d67e4a3..93f822a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -61,7 +61,7 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
# PRODUCT_FULL_TREBLE_OVERRIDE := true
# ANT+
-BOARD_ANT_WIRELESS_DEVICE := "qualcomm-uart"
+BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
# Audio
AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true
diff --git a/manifest.xml b/manifest.xml
index e1b19ee..580fb5e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -297,6 +297,15 @@
</interface>
</hal>
<hal format="hidl">
+ <name>com.qualcomm.qti.ant</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>IAntHci</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="hidl">
<name>com.qualcomm.qti.dpm.api</name>
<transport>hwbinder</transport>
<version>1.0</version>
diff --git a/msm8996.mk b/msm8996.mk
index b097376..12bc01f 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -92,8 +92,7 @@ PRODUCT_COPY_FILES += \
# ANT+
PRODUCT_PACKAGES += \
AntHalService \
- com.dsi.ant.antradio_library \
- libantradio
+ com.dsi.ant.antradio_library
# Audio
PRODUCT_PACKAGES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index cee4bac..0899c91 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -30,6 +30,14 @@ vendor/lib/rfsa/adsp/libvpp_svc_skel.so
vendor/lib/rfsa/adsp/libvpp_frc.so
vendor/lib/rfsa/adsp/us-syncproximity.so
+# ANT+
+lib64/com.qualcomm.qti.ant@1.0.so
+-lib64/libantradio.so
+lib/com.qualcomm.qti.ant@1.0.so
+-lib/libantradio.so
+vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
+vendor/lib64/com.qualcomm.qti.ant@1.0_vendor.so
+
# Audio libraries
etc/permissions/audiosphere.xml
framework/audiosphere.jar
@@ -77,7 +85,6 @@ vendor/lib/libaptX_encoder.so|984739a0bc968e18f75ced205733fe3f51c2d4f0
vendor/lib/libaptXHD_encoder.so|974c486e4ca03faa0713553d9dfe2995ac93e01c
# Bluetooth (shared dependencies)
-vendor/lib64/com.qualcomm.qti.ant@1.0_vendor.so
vendor/lib64/vendor.qti.hardware.fm@1.0_vendor.so
# Camera