anbox: Update installer script

[waydroid.git] / scripts / run-container.sh

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 96079679e1025c8eeb3bfd6f95817c40b8e6d71b..d982f0756d6a28ff5e0d821a1a3f8e024c8878b2 100644 (file)
--- 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
 
 # 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
 
 
 # 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
 
 # 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 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
 
 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
 
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder
 


@@ -35,4 +58,12 @@ chmod 777 -R /run/user/32011
 chmod 777 /dev/sw_sync
 chmod 777 /sys/kernel/debug/sync/sw_sync
 
 chmod 777 /dev/sw_sync
 chmod 777 /sys/kernel/debug/sync/sw_sync
 

+# Media nodes permissions
+chmod 777 /dev/Vcodec
+chmod 777 /dev/MTK_SMI
+chmod 777 /dev/mdp_sync
+chmod 777 /dev/mtk_cmdq
+chmod 777 /dev/video32
+chmod 777 /dev/video33
+

 lxc-start -n anbox -F -- /init
 lxc-start -n anbox -F -- /init