From d2a1043d1f3ce571f5d1b4c3d823281d33d2a168 Mon Sep 17 00:00:00 2001
From: kylon <3252255+kylon@users.noreply.github.com>
Date: Thu, 26 Dec 2024 19:41:23 +0100
Subject: [PATCH] remove waydroid option, now enabled in arch config

---
 .github/workflows/arch-builder.yml   |  1 -
 .github/workflows/fedora-builder.yml |  1 -
 .github/workflows/ubuntu-builder.yml |  1 -
 README.md                            |  1 -
 customization.cfg                    |  4 ----
 linux-tkg-config/prepare             | 18 ------------------
 6 files changed, 26 deletions(-)

diff --git a/.github/workflows/arch-builder.yml b/.github/workflows/arch-builder.yml
index 32016cb45..e66416dd9 100644
--- a/.github/workflows/arch-builder.yml
+++ b/.github/workflows/arch-builder.yml
@@ -8,7 +8,6 @@ on:
 
 
 env:
-  _waydroid: "true"
   _processor_opt: "generic"
   _git_mirror: "github.com"
   PKGDEST: "/tmp/linux-tkg"
diff --git a/.github/workflows/fedora-builder.yml b/.github/workflows/fedora-builder.yml
index 6948eeebb..12d3bbf5e 100644
--- a/.github/workflows/fedora-builder.yml
+++ b/.github/workflows/fedora-builder.yml
@@ -8,7 +8,6 @@ on:
 
 
 env:
-  _waydroid: "true"
   _processor_opt: "generic"
   _distro: "Fedora"
   _git_mirror: "github.com"
diff --git a/.github/workflows/ubuntu-builder.yml b/.github/workflows/ubuntu-builder.yml
index 4bd70f1fd..b941ccc69 100644
--- a/.github/workflows/ubuntu-builder.yml
+++ b/.github/workflows/ubuntu-builder.yml
@@ -8,7 +8,6 @@ on:
 
 
 env:
-  _waydroid: "true"
   _processor_opt: "generic"
   _distro: "Ubuntu"
   _git_mirror: "github.com"
diff --git a/README.md b/README.md
index c4cafb1dc..531a9a291 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,6 @@ The `customization.cfg` file offers many toggles for extra tweaks:
 - "Zenify" patchset using core blk, mm and scheduler tweaks from Zen
 - `ZFS` FPU symbols (<5.9)
 - Overrides for missing ACS capabilities
-- [Waydroid](https://wiki.archlinux.org/title/Waydroid) support
 - [OpenRGB](https://gitlab.com/CalcProgrammer1/OpenRGB) support
 - Provide own kernel `.config` file
 - ...
diff --git a/customization.cfg b/customization.cfg
index f7af4ed25..cbcb41503 100644
--- a/customization.cfg
+++ b/customization.cfg
@@ -185,10 +185,6 @@ _bcachefs="false"
 # ! Can't be used on multiple kernels installed side-by-side, which will require https://aur.archlinux.org/packages/ntsync-dkms instead of this option !
 _ntsync="false"
 
-# Set to "true" to enable Binder modules to use Waydroid Android containers
-# !!! Not available on Project C schedulers (PDS & BMQ) due to disabled PSI on those !!!
-_waydroid=""
-
 # Various patches and tweaks from Zen/Liquorix, Xanmod and the community - Default is "true"
 _glitched_base="true"
 
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index e3a9da6bc..bce8de468 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -1768,24 +1768,6 @@ fi
   unset tkgpatch
   unset _msg
 
-  # Waydroid
-  if [ "${_cpusched}" != "pds" ] && [ "${_cpusched}" != "bmq" ]; then
-    if [ -z "$_waydroid" ]; then
-      plain ""
-      plain "Enable android modules for use with Waydroid?"
-      plain "https://waydro.id"
-      read -rp "`echo $'    > N/y : '`" CONDITION12;
-    fi
-    if [[ "$CONDITION12" =~ [yY] ]] || [ "$_waydroid" = "true" ]; then
-      _enable "ANDROID" "ANDROID_BINDER_IPC" "ANDROID_BINDERFS"
-      _disable "ANDROID_BINDER_IPC_SELFTEST"
-      scripts/config --set-str "ANDROID_BINDER_DEVICES" ""
-      if [[ "$CONDITION12" =~ [yY] ]]; then
-        read -rp "Press enter to continue..."
-      fi
-    fi
-  fi
-
   # NR_CPUS
   if [ "$_basever" != "601" ]; then
     if [ -n "$_NR_CPUS_value" ]; then