anbox: Add multiarch support to installer

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

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 30f96566f82e640a29f959f485bc4c6650f6b1d6..05f1a08514e62967ac08a70a9478269352bcb09c 100644 (file)
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -1,6 +1,18 @@
 #!/bin/bash
 cd /home/anbox
 
 #!/bin/bash
 cd /home/anbox
 

+if [ ! -e /dev/anbox-hwbinder ] || [ ! -e /dev/ashmem ]; then
+    modprobe binder_linux devices="anbox-binder,anbox-hwbinder,anbox-vndbinder"
+    modprobe ashmem_linux
+    mkdir /dev/binderfs
+    mount -t binder binder /dev/binderfs
+    ln -s /dev/binderfs/* /dev/
+fi
+if [ ! -e /dev/anbox-hwbinder ] || [ ! -e /dev/ashmem ]; then
+    echo "ERROR: Binder and ashmem nodes not found!"
+    exit
+fi
+

 # just in case, stop Anbox 7
 stop anbox-container || true
 
 # just in case, stop Anbox 7
 stop anbox-container || true
 


@@ -20,11 +32,9 @@ stop nfcd
 # umount rootfs if it was mounted
 umount -l rootfs || true
 
 # umount rootfs if it was mounted
 umount -l rootfs || true
 

-mkdir -p /home/anbox/rootfs
-mkdir -p /home/anbox/data
-mount anbox_arm64_system.img rootfs
+mount anbox_*_system.img rootfs

 mount -o remount,ro rootfs
 mount -o remount,ro rootfs

-mount anbox_arm64_vendor.img rootfs/vendor
+mount anbox_*_vendor.img rootfs/vendor

 mount -o remount,ro rootfs/vendor
 mount -o bind anbox.prop rootfs/vendor/anbox.prop
 
 mount -o remount,ro rootfs/vendor
 mount -o bind anbox.prop rootfs/vendor/anbox.prop
 


@@ -36,29 +46,6 @@ else
     fi
 fi
 
     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
-if [ -f /vendor/lib/libladder.so ] && [ ! -f rootfs/vendor/lib/libladder.so ]; then
-    cd rootfs/vendor/lib
-    wget https://github.com/GS290-dev/gigaset_gs290_dump/raw/full_k63v2_64_bsp-user-10-QP1A.190711.020-1597810494-release-keys/vendor/lib/libladder.so
-    cd ../../..
-fi
-if [ -f /vendor/lib64/libladder.so ] && [ ! -f rootfs/vendor/lib64/libladder.so ]; then
-    cd rootfs/vendor/lib64
-    wget https://github.com/GS290-dev/gigaset_gs290_dump/raw/full_k63v2_64_bsp-user-10-QP1A.190711.020-1597810494-release-keys/vendor/lib64/libladder.so
-    cd ../../..
-fi
-mount -o remount,ro rootfs/vendor
-

 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder
 chmod 777 /dev/ashmem
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder
 chmod 777 /dev/ashmem