commit 7b9dbaefe9751ef9a997527150ba823ad3f2898a
author Pierre-Hugues Husson <pierre-hugues.husson@softathome.com> Mon Sep 17 14:04:50 2018 +0200
committer Jon West <electrikjesus@gmail.com> Tue Oct 30 19:31:12 2018 -0400
tree 82d7f8b00f5034f35306d98a4103886ab8657a29
parent ec7952a23f3a8351ce7c70e6370a684c09921aaf

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

Change-Id: Ib1f97259aac93031fcdec49fca4c5cd04746e5d1

rw-system.sh

diff --git a/rw-system.sh b/rw-system.sh
index 286cebd..7144e8d 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -1,6 +1,7 @@
 #!/system/bin/sh
 
 
+vndk="$(getprop persist.sys.vndk)"
 setprop sys.usb.ffs.aio_compat true
 
 fixSPL() {
@@ -152,3 +153,7 @@
 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
 fi
+
+if [ "$vndk" == 27 -o "$vndk" == 26 ];then
+    mount -o bind /system/phh/libnfc-nci-oreo.conf /system/etc/libnfc-nci.conf
+fi