zendone7: Track Qti vibrator from a15 branch and build libqtivibratoreffect from source
Change-Id: Iacfebff0467723649063b6602d0328cc44038dd7
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/configs/excluded-input-devices.xml b/configs/excluded-input-devices.xml
deleted file mode 100644
index 32aac2c..0000000
--- a/configs/excluded-input-devices.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2018 The Linux Foundation. All rights reserved. -->
-<!-- -->
-<!-- Redistribution and use in source and binary forms, with or without -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met: -->
-<!-- * Redistributions of source code must retain the above copyright -->
-<!-- notice, this list of conditions and the following disclaimer. -->
-<!-- * Redistributions in binary form must reproduce the above -->
-<!-- copyright notice, this list of conditions and the following -->
-<!-- disclaimer in the documentation and/or other materials provided -->
-<!-- with the distribution. -->
-<!-- * Neither the name of The Linux Foundation nor the names of its -->
-<!-- contributors may be used to endorse or promote products derived -->
-<!-- from this software without specific prior written permission. -->
-<!-- -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
-<!-- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
-<devices>
- <device name="qti-haptics"/>
-</devices>
diff --git a/device.mk b/device.mk
index e29f3f0..aa642c3 100755
--- a/device.mk
+++ b/device.mk
@@ -169,7 +169,7 @@
# Exclude vibrator from InputManager
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
+ vendor/qcom/opensource/vibrator/excluded-input-devices.xml:$(TARGET_COPY_OUT_VENDOR)/etc/excluded-input-devices.xml
# fastbootd
PRODUCT_PACKAGES += \
diff --git a/omni.dependencies b/omni.dependencies
index ff60c61..06cc1d0 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -112,6 +112,6 @@
"remote": "gitlab",
"repository": "android_vendor_qcom_opensource_vibrator",
"target_path": "vendor/qcom/opensource/vibrator",
- "revision": "android-13.0"
+ "revision": "android-15"
}
]
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 2316910..397624d 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -1189,7 +1189,6 @@
vendor/lib/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so
vendor/lib/hw/vendor.qti.hardware.soter@1.0-impl.so
vendor/lib/hw/vendor.qti.sla.service@1.0-impl.so
-vendor/lib/hw/vibrator.default.so
vendor/lib/hw/vulkan.adreno.so
vendor/lib/lib-imscmservice.so
vendor/lib/lib-imsdpl.so
@@ -1787,7 +1786,6 @@
vendor/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so
vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
vendor/lib64/hw/vendor.qti.sla.service@1.0-impl.so
-vendor/lib64/hw/vibrator.default.so
vendor/lib64/hw/vulkan.adreno.so
vendor/lib64/lib-imscmservice.so
vendor/lib64/lib-imsdpl.so
@@ -2055,7 +2053,6 @@
vendor/lib64/libqti-utils.so
vendor/lib64/libqtigef.so
vendor/lib64/libqtikeymaster4.so
-vendor/lib64/libqtivibratoreffect.so
vendor/lib64/librcc.so
vendor/lib64/librecovery_updater.so
vendor/lib64/librecovery_updater_msm.so