Remove useless implementation and move upwards so that github no longer thinks there are merge conflicts

This commit is contained in:
Hackintosh 5 2019-01-04 16:52:15 +00:00
parent 6f52d92fee
commit fb31ebd929

View File

@ -210,6 +210,18 @@ if getprop ro.product.model |grep -qF ANE;then
setprop debug.sf.latch_unsignaled 1 setprop debug.sf.latch_unsignaled 1
fi fi
if getprop ro.vendor.build.fingerprint |grep -iq -E -e 'huawei|honor' || getprop persist.sys.overlay.huawei |grep -iq -E -e 'true' ; then
p=/product/etc/nfc/libnfc_nxp_*_*.conf
mount -o bind "$p" /system/etc/libnfc-nxp.conf ||
mount -o bind /product/etc/libnfc-nxp.conf /system/etc/libnfc-nxp.conf || true
p=/product/etc/nfc/libnfc_brcm_*_*.conf
mount -o bind "$p" /system/etc/libnfc-brcm.conf ||
mount -o bind /product/etc/libnfc-nxp.conf /system/etc/libnfc-nxp.conf || true
mount -o bind /system/phh/libnfc-nci-huawei.conf /system/etc/libnfc-nci.conf
fi
if getprop ro.vendor.build.fingerprint | grep -qE -e ".*(crown|star)[q2]*lte.*" -e ".*(SC-0[23]K|SCV3[89]).*";then if getprop ro.vendor.build.fingerprint | grep -qE -e ".*(crown|star)[q2]*lte.*" -e ".*(SC-0[23]K|SCV3[89]).*";then
for f in /vendor/lib/libfloatingfeature.so /vendor/lib64/libfloatingfeature.so;do for f in /vendor/lib/libfloatingfeature.so /vendor/lib64/libfloatingfeature.so;do
[ ! -f $f ] && continue [ ! -f $f ] && continue
@ -225,23 +237,4 @@ if getprop ro.vendor.build.fingerprint | grep -qE -e ".*(crown|star)[q2]*lte.*"
done done
fi fi
if getprop ro.vendor.build.fingerprint |grep -iq -E -e 'huawei|honor' || getprop persist.sys.overlay.huawei |grep -iq -E -e 'true' ; then
p=/product/etc/nfc/libnfc_nxp_*_*.conf
mount -o bind "$p" /system/etc/libnfc-nxp.conf ||
mount -o bind /product/etc/libnfc-nxp.conf /system/etc/libnfc-nxp.conf || true
p=/product/etc/nfc/libnfc_brcm_*_*.conf
mount -o bind "$p" /system/etc/libnfc-brcm.conf ||
mount -o bind /product/etc/libnfc-nxp.conf /system/etc/libnfc-nxp.conf || true
mount -o bind /system/phh/libnfc-nci-huawei.conf /system/etc/libnfc-nci.conf
fi
if getprop ro.vendor.build.fingerprint |grep -iq -E -e 'huawei|honor' || getprop persist.sys.overlay.huawei |grep -iq -E -e 'true' ; then
mount -o bind /product/etc/nfc/libnfc-nxp_*_*.conf /system/etc/libnfc-nxp.conf
mount -o bind /product/etc/nfc/libnfc_brcm_*_*.conf /system/etc/libnfc-brcm.conf
mount -o bind /product/etc/nfc/libnfc-nxp.conf /system/etc/libnfc-nxp.conf
mount -o bind /product/etc/nfc/libnfc_brcm.conf /system/etc/libnfc-brcm.conf
fi
mount -o bind /mnt/phh/empty_dir /vendor/etc/audio || true mount -o bind /mnt/phh/empty_dir /vendor/etc/audio || true