msm8996-common: Add ANT+ backlineage-17.1

* Also switch to op5 blobs since daisy ones don't
  support ANT+
* From OnePlus5-user 9 PKQ1.180716.001 2002242003 release-keys

12 files changed, 21 insertions, 1 deletions

diff --git a/msm8996-common/Android.bp b/msm8996-common/Android.bp
index 45769dd..ce7c460 100644
--- a/msm8996-common/Android.bp
+++ b/msm8996-common/Android.bp
@@ -20,6 +20,24 @@ soong_namespace {
 }
 
 cc_prebuilt_library_shared {
+	name: "libantradio",
+	owner: "zuk",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm: {
+			srcs: ["proprietary/lib/libantradio.so"],
+		},
+		android_arm64: {
+			srcs: ["proprietary/lib64/libantradio.so"],
+		},
+	},
+	compile_multilib: "both",
+	prefer: true,
+}
+
+cc_prebuilt_library_shared {
 	name: "libgpustats",
 	owner: "zuk",
 	strip: {
diff --git a/msm8996-common/msm8996-common-vendor.mk b/msm8996-common/msm8996-common-vendor.mk
index 373ab3c..6c0a122 100644
--- a/msm8996-common/msm8996-common-vendor.mk
+++ b/msm8996-common/msm8996-common-vendor.mk
@@ -66,6 +66,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrc.so \
     vendor/zuk/msm8996-common/proprietary/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM)/lib/libwfduibcsrcinterface.so \
     vendor/zuk/msm8996-common/proprietary/lib/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib/vendor.qti.hardware.tui_comm@1.0.so \
+    vendor/zuk/msm8996-common/proprietary/lib64/com.qualcomm.qti.ant@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/com.qualcomm.qti.ant@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/fingerprint.qcom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.qcom.so \
     vendor/zuk/msm8996-common/proprietary/lib64/lib-imscamera.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/lib-imscamera.so \
@@ -96,7 +97,6 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.gnss@1.2.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.gnss@2.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.gnss@2.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.gnss@2.1.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.gnss@2.1.so \
-    vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.hardware.fm@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.hardware.tui_comm@1.0.so \
     vendor/zuk/msm8996-common/proprietary/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM)/lib64/vendor.qti.imsrtpservice@1.0.so \
     vendor/zuk/msm8996-common/proprietary/product/bin/dpmd:$(TARGET_COPY_OUT_PRODUCT)/bin/dpmd \
@@ -487,6 +487,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_adreno.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/activity_recognition.msm8996.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/activity_recognition.msm8996.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
+    vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/gatekeeper.msm8996.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/gatekeeper.msm8996.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/keystore.msm8996.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/keystore.msm8996.so \
     vendor/zuk/msm8996-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@1.0-impl.so \
@@ -665,6 +666,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/msm8996-common/proprietary/vendor/radio/qcril_database/qcril.db:$(TARGET_COPY_OUT_VENDOR)/radio/qcril_database/qcril.db
 
 PRODUCT_PACKAGES += \
+    libantradio \
     libgpustats \
     libsdm-disp-vndapis \
     libthermalclient \
diff --git a/msm8996-common/proprietary/lib/libantradio.so b/msm8996-common/proprietary/lib/libantradio.so
new file mode 100644
index 0000000..b66c853
--- /dev/null
+++ b/msm8996-common/proprietary/lib/libantradio.so
diff --git a/msm8996-common/proprietary/lib64/com.qualcomm.qti.ant@1.0.so b/msm8996-common/proprietary/lib64/com.qualcomm.qti.ant@1.0.so
new file mode 100644
index 0000000..9a4c095
--- /dev/null
+++ b/msm8996-common/proprietary/lib64/com.qualcomm.qti.ant@1.0.so
diff --git a/msm8996-common/proprietary/lib64/libantradio.so b/msm8996-common/proprietary/lib64/libantradio.so
new file mode 100644
index 0000000..5b0e299
--- /dev/null
+++ b/msm8996-common/proprietary/lib64/libantradio.so
diff --git a/msm8996-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/msm8996-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
index 0aa56c2..6538951 100644
--- a/msm8996-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
+++ b/msm8996-common/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
diff --git a/msm8996-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so b/msm8996-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so
new file mode 100644
index 0000000..0905c79
--- /dev/null
+++ b/msm8996-common/proprietary/vendor/lib64/com.qualcomm.qti.ant@1.0.so
diff --git a/msm8996-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/msm8996-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
index cc51b49..57afb1f 100644
--- a/msm8996-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
+++ b/msm8996-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
diff --git a/msm8996-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so b/msm8996-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
new file mode 100644
index 0000000..edfde72
--- /dev/null
+++ b/msm8996-common/proprietary/vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so
diff --git a/msm8996-common/proprietary/vendor/lib64/libbt-hidlclient.so b/msm8996-common/proprietary/vendor/lib64/libbt-hidlclient.so
index d483935..988854a 100644
--- a/msm8996-common/proprietary/vendor/lib64/libbt-hidlclient.so
+++ b/msm8996-common/proprietary/vendor/lib64/libbt-hidlclient.so
diff --git a/msm8996-common/proprietary/vendor/lib64/libbtnv.so b/msm8996-common/proprietary/vendor/lib64/libbtnv.so
index 3bfde80..0e1889d 100644
--- a/msm8996-common/proprietary/vendor/lib64/libbtnv.so
+++ b/msm8996-common/proprietary/vendor/lib64/libbtnv.so
diff --git a/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so b/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so
index f87eaf8..df4ecda 100644
--- a/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so
+++ b/msm8996-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so