psmattas/device_oneplus_avicii-Droidx
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm8250-common: Switch to AOSP NXP NFC HAL

Browse Source 
Test: Verified NFC turns on, can read tags, and went
      to a Dunkin Donuts and used Google Pay.

Change-Id: I8cd8815ab883d83a5c07c8f01a9bdeff594c470b
This commit is contained in:
Alexander Koskovich
2022-06-09 02:57:16 -07:00
committed by LuK1337
parent d71fe353e7
commit 310cdffbc9
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common.mk
View File

@@ -272,15 +272,11 @@ PRODUCT_PACKAGES += \
android.hardware.neuralnetworks@1.3.vendor android.hardware.neuralnetworks@1.3.vendor
# NFC # NFC
PRODUCT_SOONG_NAMESPACES += \
vendor/nxp/opensource/sn100x
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.nfc_snxxx@1.2-service \
android.hardware.secure_element@1.2.vendor \ android.hardware.secure_element@1.2.vendor \
com.android.nfc_extras \ com.android.nfc_extras \
NfcNci \ NfcNci \
nqnfcinfo \
vendor.nxp.hardware.nfc@2.0-service \
Tag Tag
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

8
device_framework_matrix.xml
View File

@@ -15,6 +15,14 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl" optional="true">
<name>vendor.nxp.nxpnfc</name>
<version>2.0</version>
<interface>
<name>INxpNfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true"> <hal format="hidl" optional="true">
<name>vendor.oneplus.faceunlock.hal</name> <name>vendor.oneplus.faceunlock.hal</name>
<version>1.0</version> <version>1.0</version>

2
extract-files.sh
View File

@@ -72,7 +72,7 @@ function blob_fixup() {
system_ext/lib64/libwfdnative.so) system_ext/lib64/libwfdnative.so)
sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}" sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}"
;; ;;
vendor/etc/libnfc-mtp-SN100.conf) vendor/etc/libnfc-nxp.conf)
sed -i "s/^NXP_RF_CONF_BLK_9/#NXP_RF_CONF_BLK_9/" "${2}" sed -i "s/^NXP_RF_CONF_BLK_9/#NXP_RF_CONF_BLK_9/" "${2}"
sed -i "s/^NXP_RF_CONF_BLK_10/#NXP_RF_CONF_BLK_10/" "${2}" sed -i "s/^NXP_RF_CONF_BLK_10/#NXP_RF_CONF_BLK_10/" "${2}"
;; ;;

4
manifest.xml
View File

@@ -182,11 +182,11 @@
</interface> </interface>
</hal> </hal>
<hal format="hidl"> <hal format="hidl">
<name>vendor.nxp.hardware.nfc</name> <name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>
<version>2.0</version> <version>2.0</version>
<interface> <interface>
<name>INqNfc</name> <name>INxpNfc</name>
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>

2
proprietary-files.txt
View File

@@ -859,7 +859,7 @@ vendor/lib64/unnhal-acc-hta.so
vendor/lib64/unnhal-acc-hvx.so vendor/lib64/unnhal-acc-hvx.so
# NFC # NFC
odm/etc/nfc/libnfc-mtp-SN100.conf_19805:vendor/etc/libnfc-mtp-SN100.conf odm/etc/nfc/libnfc-mtp-SN100.conf_19805:vendor/etc/libnfc-nxp.conf
odm/etc/nfc/libnfc-nci.conf_19805:vendor/etc/libnfc-nci.conf odm/etc/nfc/libnfc-nci.conf_19805:vendor/etc/libnfc-nci.conf
odm/lib/libsn100u_fw.so:vendor/lib/libsn100u_fw.so odm/lib/libsn100u_fw.so:vendor/lib/libsn100u_fw.so