Forgot to test on x86 Pi OS

Author: techguy16

apps/Waydroid/install-64

@@ -5,6 +5,9 @@ if [[ "$(cat /proc/device-tree/model)" == "Raspberry Pi"* ]]; then
     sudo echo "psi=1" >> /boot/firmware/cmdline.txt
 fi
 
+sudo curl -Sf https://repo.waydro.id/waydroid.gpg --output /usr/share/keyrings/waydroid.gpg
+echo "deb [signed-by=/usr/share/keyrings/waydroid.gpg] https://repo.waydro.id/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/waydroid.list
+
 # Modified from https://github.com/waydroid/waydroid/issues/214#issuecomment-1120926304
 sudo apt install build-essential cdbs devscripts equivs fakeroot \
   git git-buildpackage git-lfs libgbinder-dev -y
@@ -24,9 +27,6 @@ sudo apt install -f -y ../*.deb
 sudo rm -rf /usr/bin/build_changelog
 ########################################################################################
 
-sudo curl -Sf https://repo.waydro.id/waydroid.gpg --output /usr/share/keyrings/waydroid.gpg
-echo "deb [signed-by=/usr/share/keyrings/waydroid.gpg] https://repo.waydro.id/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/waydroid.list
-
 sudo apt update
 sudo apt install waydroid -y
 

apps/Waydroid/install-x64

@@ -3,6 +3,25 @@
 sudo apt install curl ca-certificates -y
 curl -s https://repo.waydro.id | sudo bash
 
+# Modified from https://github.com/waydroid/waydroid/issues/214#issuecomment-1120926304
+sudo apt install build-essential cdbs devscripts equivs fakeroot \
+  git git-buildpackage git-lfs libgbinder-dev -y
+
+sudo wget https://raw.githubusercontent.com/MrCyjaneK/waydroid-build/main/build_changelog \
+  -O /usr/bin/build_changelog
+sudo chmod +x /usr/bin/build_changelog
+
+mkdir /tmp/gbinder
+cd /tmp/gbinder
+git clone https://github.com/waydroid/gbinder-python.git
+cd gbinder-python
+build_changelog
+sudo mk-build-deps -ir -t "apt -o Debug::pkgProblemResolver=yes -y --no-install-recommends"
+sudo debuild -b -uc -us
+sudo apt install -f -y ../*.deb
+sudo rm -rf /usr/bin/build_changelog
+########################################################################################
+
 sudo apt install waydroid -y
 
 sudo waydroid init -f -s GAPPS # Install with G-Apps support