X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/2404343dc75cf6ff14037d8d25d9e2da56b6815b..7b9630794a6da4d7f2111189ada7b2729d0f77bb:/scripts/run-container.sh

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index c8feb05..d982f07 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -7,13 +7,15 @@ stop anbox-container || true
 # start cgroup-lite, else container may fail to start.
 start cgroup-lite
 
-# stop sensorfw
-# NOTE: it is temporary solution, that workes only on halium devices.
-stop sensorfw
+# start sensors hal
+start anbox-sensors
 
 # start lxc-net, that sets up lxc bridge
 start lxc-net
 
+# stop nfcd to not conflict with anbox
+stop nfcd
+
 # umount rootfs if it was mounted
 umount -l rootfs || true
 
@@ -22,9 +24,30 @@ mkdir -p /home/anbox/data
 mount anbox_arm64_system.img rootfs
 mount -o remount,ro rootfs
 mount anbox_arm64_vendor.img rootfs/vendor
-mount -o remount,ro rootfs
+mount -o remount,ro rootfs/vendor
 mount -o bind anbox.prop rootfs/vendor/anbox.prop
 
+if mountpoint -q -- /odm; then
+    mount -o bind /odm rootfs/odm_extra
+else
+    if [ -d /vendor/odm ]; then
+        mount -o bind /vendor/odm rootfs/odm_extra
+    fi
+fi
+
+# TODO: Move this to installer script
+SKU=`getprop ro.boot.product.hardware.sku`
+mount -o remount,rw rootfs/vendor
+cp -p /vendor/etc/permissions/android.hardware.nfc.* rootfs/vendor/etc/permissions/
+cp -p /vendor/etc/permissions/android.hardware.consumerir.xml rootfs/vendor/etc/permissions/
+cp -p /odm/etc/permissions/android.hardware.nfc.* rootfs/vendor/etc/permissions/
+cp -p /odm/etc/permissions/android.hardware.consumerir.xml rootfs/vendor/etc/permissions/
+if [ ! -z $SKU ]; then
+    cp -p /odm/etc/permissions/sku_${SKU}/android.hardware.nfc.* rootfs/vendor/etc/permissions/
+    cp -p /odm/etc/permissions/sku_${SKU}/android.hardware.consumerir.xml rootfs/vendor/etc/permissions/
+fi
+mount -o remount,ro rootfs/vendor
+
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder