Merge changes from topic "revert-25252188-qfp_sba4500-ADYJLGANRC" into main

* changes:
  Revert "Add vendor.qti.hardware.fingerprint aidl to xml"
  Revert "Add QFingerprintService to makefile."
This commit is contained in:
Alec Foster 2023-11-10 00:50:14 +00:00 committed by Android (Google) Code Review
commit ca4c84bdc6
2 changed files with 3 additions and 21 deletions

View file

@ -6,27 +6,11 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="hidl" optional="true">
<name>vendor.qti.hardware.fingerprint</name> <name>vendor.qti.hardware.fingerprint</name>
<version>1</version> <version>1.0</version>
<interface> <interface>
<name>IQfpExtendedFingerprint</name> <name>IQtiExtendedFingerprint</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>vendor.qti.hardware.fingerprint</name>
<version>1</version>
<interface>
<name>IQfpExtendedSession</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>vendor.qti.hardware.fingerprint</name>
<version>1</version>
<interface>
<name>IQfpExtendedSessionCallback</name>
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>

View file

@ -16,12 +16,10 @@
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/qcom/fingerprint/qfp-service \ vendor/qcom/fingerprint/qfp-service \
vendor/qcom/fingerprint/QFingerprintService \
vendor/qcom/fingerprint/QFPCalibration \ vendor/qcom/fingerprint/QFPCalibration \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
qfp-daemon \ qfp-daemon \
QFingerprintService \
QFPCalibration \ QFPCalibration \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \