Replace libnfc-nci.conf with Oreo's on Oreo vendor devices

As of pie the previous PRODUCT_COPY_FILES line was ignored because
it got copied from device/generic/common/nfc/libnfc-nci.conf instead
This commit is contained in:
Pierre-Hugues Husson 2018-09-17 14:04:50 +02:00
parent 07a370207f
commit 61f745995c
2 changed files with 6 additions and 1 deletions

View File

@ -45,7 +45,7 @@ PRODUCT_COPY_FILES += \
# Provide default libnfc-nci.conf file for devices that does not have one in # Provide default libnfc-nci.conf file for devices that does not have one in
# vendor/etc # vendor/etc
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/phh/treble/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf device/phh/treble/nfc/libnfc-nci.conf:system/phh/libnfc-nci-oreo.conf
# LineageOS build may need this to make NFC work # LineageOS build may need this to make NFC work
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View File

@ -1,6 +1,7 @@
#!/system/bin/sh #!/system/bin/sh
vndk="$(getprop persist.sys.vndk)"
setprop sys.usb.ffs.aio_compat true setprop sys.usb.ffs.aio_compat true
fixSPL() { fixSPL() {
@ -152,3 +153,7 @@ fi
if [ -f /vendor/bin/hw/vendor.samsung.hardware.miscpower@1.0-service ];then if [ -f /vendor/bin/hw/vendor.samsung.hardware.miscpower@1.0-service ];then
mount -o bind /system/phh/empty /vendor/bin/hw/android.hardware.power@1.0-service mount -o bind /system/phh/empty /vendor/bin/hw/android.hardware.power@1.0-service
fi fi
if [ "$vndk" == 27 -o "$vndk" == 26 ];then
mount -o bind /system/phh/libnfc-nci-oreo.conf /system/etc/libnfc-nci.conf
fi