From 15a644cdfe990d1eaecc21dd24209b82c07a4da3 Mon Sep 17 00:00:00 2001
From: Erfan Abdi <erfangplus@gmail.com>
Date: Mon, 14 Jun 2021 13:21:38 +0430
Subject: [PATCH] anbox: Move out vendor fixups from installer script

---
 scripts/install.sh       |  8 ++++++++
 scripts/run-container.sh | 25 -------------------------
 scripts/vendor-fixup.sh  | 26 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 scripts/vendor-fixup.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index 915cfb9..952fa43 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -36,6 +36,8 @@ fi
 rm -f latest-raw-images.zip
 wget https://build.lolinet.com/file/lineage/anbox_arm64/latest-raw-images.zip
 unzip latest-raw-images.zip
+mkdir -p /home/anbox/rootfs
+mkdir -p /home/anbox/data
 
 echo "Geting latest runner script"
 rm -f run-container.sh
@@ -79,6 +81,12 @@ if [ -f NO_SENSORS ]; then
 	rm NO_SENSORS
 fi
 
+# TODO: Get rid of this
+rm -f vendor-fixup.sh
+wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/scripts/vendor-fixup.sh
+chmod +x vendor-fixup.sh
+./vendor-fixup.sh
+
 echo "Geting latest lxc config"
 mkdir /var/lib/lxc/anbox
 cd /var/lib/lxc/anbox
diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 9f5d367..43345ee 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -32,8 +32,6 @@ stop nfcd
 # 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 -o remount,ro rootfs
 mount anbox_arm64_vendor.img rootfs/vendor
@@ -48,29 +46,6 @@ else
     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
diff --git a/scripts/vendor-fixup.sh b/scripts/vendor-fixup.sh
new file mode 100644
index 0000000..042f183
--- /dev/null
+++ b/scripts/vendor-fixup.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+mkdir /home/anbox/tmp_vendor
+mount /home/anbox/anbox_arm64_vendor.img /home/anbox/tmp_vendor
+
+SKU=`getprop ro.boot.product.hardware.sku`
+cp -p /vendor/etc/permissions/android.hardware.nfc.* /home/anbox/tmp_vendor/etc/permissions/
+cp -p /vendor/etc/permissions/android.hardware.consumerir.xml /home/anbox/tmp_vendor/etc/permissions/
+cp -p /odm/etc/permissions/android.hardware.nfc.* /home/anbox/tmp_vendor/etc/permissions/
+cp -p /odm/etc/permissions/android.hardware.consumerir.xml /home/anbox/tmp_vendor/etc/permissions/
+if [ ! -z $SKU ]; then
+    cp -p /odm/etc/permissions/sku_${SKU}/android.hardware.nfc.* /home/anbox/tmp_vendor/etc/permissions/
+    cp -p /odm/etc/permissions/sku_${SKU}/android.hardware.consumerir.xml /home/anbox/tmp_vendor/etc/permissions/
+fi
+if [ -f /vendor/lib/libladder.so ] && [ ! -f /home/anbox/tmp_vendor/lib/libladder.so ]; then
+    cd /home/anbox/tmp_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 /home/anbox/tmp_vendor/lib64/libladder.so ]; then
+    cd /home/anbox/tmp_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
+umount /home/anbox/tmp_vendor
+rm -rf /home/anbox/tmp_vendor
-- 
2.47.3