From d54131a1b2a89fb53a8be5e58beb7882fdcbb40b Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Tue, 4 Aug 2026 08:41:07 -0700
Subject: [PATCH] android, fix playbook to also work on Artix.

---
 facts/general/package.yml                    | 12 +++++++++
 tasks/workstation/linux/software/android.yml | 26 ++++++++++----------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/facts/general/package.yml b/facts/general/package.yml
index 793055c..d9abfa7 100644
--- a/facts/general/package.yml
+++ b/facts/general/package.yml
@@ -30,6 +30,12 @@
     z_libs: zlib
     bzip: bzip2
     dunst: dunst
+    android_jdk: openjdk
+    ncurses: ncurses
+    android_fastboot: fastboot
+    android_adb: adb
+    android_sdkmanager: sdkmanager
+    android_udev: android-udev
 
 - name: General | Facts | Package | Parrot OS Fixes
   set_fact:
@@ -59,6 +65,9 @@
     cpp_libs: libstdc++6
     z_libs: lib32z1
     bzip: libbz2-1.0
+    android_jdk: default-jdk
+    ncurses: libncurses5
+    android_udev: android-udev-rules
   when: ansible_pkg_mgr == "apt"
 
 - name: General | Facts | Package | pacman
@@ -72,6 +81,9 @@
     dig: bind
     base_devel: base-devel
     macbook_wifi_driver: broadcom-wl-dkms
+    android_jdk: jdk-openjdk
+    android_fastboot: android-tools
+    android_adb: android-tools
   when: ansible_pkg_mgr == "pacman"
 
 - name: General | Facts | Package | FreeBSD
diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index c459983..d3d5586 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -173,21 +173,23 @@
 - name: Workstation | Linux | Software | Android | Dependencies [Install]
   package:
     name:
-      - default-jdk
-      - libc6
-      - libncurses5
-      - libstdc++6
-      - lib32z1
-      - libbz2-1.0
+      - "{{ android_jdk }}"
+      - "{{ c_libs }}"
+      - "{{ ncurses }}"
+      - "{{ cpp_libs }}"
+      - "{{ z_libs }}"
+      - "{{ bzip }}"
+      - "{{ android_udev }}"
     state: present
   when: coding == true
 
 - name: Workstation | Linux | Software | Android | Dependencies [Remove]
   package:
     name:
-      - sdkmanager
+      - "{{ android_sdkmanager }}"
     state: absent
   when: coding == true
+    and ansible_pkg_mgr == "apt"
 
 ## Install SDK ##
 
@@ -358,17 +360,15 @@
 - name: Workstation | Linux | Software | Android | System Tools [Install]
   package:
     name:
-      - fastboot
-      - adb
+      - "{{ android_fastboot }}"
+      - "{{ android_adb }}"
     state: present
   when: not coding == true
-    and ansible_pkg_mgr == "apt"
 
 - name: Workstation | Linux | Software | Android | System Tools [Remove]
   package:
     name:
-      - fastboot
-      - adb
+      - "{{ android_fastboot }}"
+      - "{{ android_adb }}"
     state: absent
   when: coding == true
-    and ansible_pkg_mgr == "apt"