aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarragh McGee <darraghmcgee20@gmail.com>2019-06-30 14:55:22 +0200
committerDarragh McGee <darraghmcgee20@gmail.com>2019-06-30 14:55:22 +0200
commite7de934fe755a2c52de7dd94a50fc809b65f04c0 (patch)
tree663c4aa7a8355482a6071ac4b9cef9af6d2a39c3
parent97287e858a725099788c0389c750a8b3c5e34475 (diff)
oneplus3: Remove ANT+
-rw-r--r--BoardConfig.mk3
-rw-r--r--aicp_oneplus3.mk2
-rw-r--r--configs/manifest.xml9
-rw-r--r--device.mk8
-rw-r--r--proprietary-files.txt7
5 files changed, 1 insertions, 28 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d3ab56d4..dbed7642 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -72,9 +72,6 @@ TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
# QCOM hardware
BOARD_USES_QCOM_HARDWARE := true
-# ANT+
-BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
-
# Audio
#AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true
diff --git a/aicp_oneplus3.mk b/aicp_oneplus3.mk
index 8002e2d1..06a8dd16 100644
--- a/aicp_oneplus3.mk
+++ b/aicp_oneplus3.mk
@@ -20,7 +20,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from oneplus3 device
$(call inherit-product, device/oneplus/oneplus3/device.mk)
-# Inherit some common AOSiP stuff.
+# Inherit some common AICP stuff.
$(call inherit-product, vendor/aicp/config/common_full_phone.mk)
PRODUCT_NAME := aicp_oneplus3
diff --git a/configs/manifest.xml b/configs/manifest.xml
index 5191343c..9220ed37 100644
--- a/configs/manifest.xml
+++ b/configs/manifest.xml
@@ -193,15 +193,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</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>android.hardware.power</name>
<transport>hwbinder</transport>
<version>1.1</version>
diff --git a/device.mk b/device.mk
index b1ebccc1..dec80564 100644
--- a/device.mk
+++ b/device.mk
@@ -184,14 +184,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
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
-
-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
-
# Bluetooth
PRODUCT_PROPERTY_OVERRIDES += \
vendor.qcom.bluetooth.soc=rome
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e6bbcc7f..ba7da8bf 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -40,13 +40,6 @@ lib64/vendor.oneplus.hardware.ifaa@2.0.so
vendor/bin/hw/vendor.oneplus.hardware.ifaa@2.0-service
vendor/etc/init/vendor.oneplus.hardware.ifaa@2.0-service.rc
-# ANT+ - from LA.UM.7.5.r1-04000-8x96.0
--lib/libantradio.so|4f03cc258ec1806ddb7100252e2b8e6433693027
-lib64/com.qualcomm.qti.ant@1.0.so|f764999a53054c78f9e8a6f1d1bfcad3d446fb02
--lib64/libantradio.so|247bf6302abcbc55e0006aa7032097069a7a2f96
-vendor/lib64/com.qualcomm.qti.ant@1.0.so|f764999a53054c78f9e8a6f1d1bfcad3d446fb02
-vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so|8ce47bae3b903a56697c69b416927e569d7e7b80
-
# Audio
etc/firmware/tfa98xx.cnt
vendor/lib/libacdb-fts.so