Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove waydroid option, now enabled in arch config #1055

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/arch-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:


env:
_waydroid: "true"
_processor_opt: "generic"
_git_mirror: "github.com"
PKGDEST: "/tmp/linux-tkg"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/fedora-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:


env:
_waydroid: "true"
_processor_opt: "generic"
_distro: "Fedora"
_git_mirror: "github.com"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ubuntu-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:


env:
_waydroid: "true"
_processor_opt: "generic"
_distro: "Ubuntu"
_git_mirror: "github.com"
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- ...
Expand Down
4 changes: 0 additions & 4 deletions customization.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
18 changes: 0 additions & 18 deletions linux-tkg-config/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down