From 5be56dd7f8f9e9e3bb54d09c4793533e3efba03b Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Tue, 29 Sep 2026 10:31:45 -0700
Subject: [PATCH] android, use the new sdk manager `android`.

---
 tasks/workstation/linux/software/android.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index f938513..2cb0d90 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -27,8 +27,8 @@
 
 - name: Workstation | Linux | Software | Android | Facts [3/3]
   set_fact:
-    android_sdkmanager_temp: "{{ android_sdk_cmdline_temp }}/cmdline-tools/bin/sdkmanager"
-    android_sdkmanager_final: "{{ android_sdk_cmdline_final }}/sdkmanager"
+    android_sdkmanager_temp: "{{ android_sdk_cmdline_temp }}/cmdline-tools/bin/android sdk"
+    android_sdkmanager_final: "{{ android_sdk_cmdline_final }}/android sdk"
 
 # Regarding images to download; the `default` is the smallest, then `playstore`.
 # The `google_apis` images are significantly larger than the `playstore` option.
@@ -229,7 +229,7 @@
 
 # This can only be run once, otherwise cmdline-tools creates latest-* folders.
 - name: Workstation | Linux | Software | Android | Install | Consistent Modules
-  shell: "yes | {{ android_sdkmanager_temp }} --install '{{ item }}' --sdk_root={{ android_sdk_location }}"
+  shell: "yes | {{ android_sdkmanager_temp }} install '{{ item }}' --sdk={{ android_sdk_location }}"
   loop:
     # Current
     - cmdline-tools/latest
@@ -243,7 +243,7 @@
 - name: Workstation | Linux | Software | Android | Install | Required Modules
   shell: |
     if ! {{ android_sdkmanager_final }} --list_installed | grep -q '{{ item }}'; then
-      yes | {{ android_sdkmanager_final }} --install '{{ item }}' --sdk_root={{ android_sdk_location }}
+      yes | {{ android_sdkmanager_final }} install '{{ item }}' --sdk={{ android_sdk_location }}
     fi
   loop: "{{ android_downloads_required }}"
   become_user: "{{ user }}"
@@ -253,7 +253,7 @@
 - name: Workstation | Linux | Software | Android | Install | Additional Modules
   shell: |
     if ! {{ android_sdkmanager_final }} --list_installed | grep -q '{{ item }}'; then
-      yes | {{ android_sdkmanager_final }} --install '{{ item }}' --sdk_root={{ android_sdk_location }}
+      yes | {{ android_sdkmanager_final }} install '{{ item }}' --sdk={{ android_sdk_location }}
     fi
   loop: "{{ android_downloads_additional }}"
   become_user: "{{ user }}"
@@ -262,7 +262,7 @@
 
 # Remove extra downloads if system is not meant for full amount of testing.
 - name: Workstation | Linux | Software | Android | Uninstall | Additional Modules
-  shell: "yes | {{ android_sdkmanager_final }} --uninstall '{{ item }}' --sdk_root={{ android_sdk_location }}"
+  shell: "yes | {{ android_sdkmanager_final }} remove '{{ item }}' --sdk={{ android_sdk_location }}"
   loop: "{{ android_downloads_additional }}"
   become_user: "{{ user }}"
   when: coding != true
@@ -271,14 +271,14 @@
 
 # Remove any versions which used to be part of this script and no longer used.
 - name: Workstation | Linux | Software | Android | Uninstall | Unused Modules
-  shell: "yes | {{ android_sdkmanager_final }} --uninstall '{{ item }}' --sdk_root={{ android_sdk_location }}"
+  shell: "yes | {{ android_sdkmanager_final }} remove '{{ item }}' --sdk={{ android_sdk_location }}"
   loop: "{{ android_downloads_unused }}"
   become_user: "{{ user }}"
   when: coding == true
 
 # Report the currently installed packges.
 - name: Workstation | Linux | Software | Android | Report Modules
-  shell: "{{ android_sdkmanager_final }} --list_installed --sdk_root={{ android_sdk_location }} > {{ android_report_file }}"
+  shell: "{{ android_sdkmanager_final }} list --sdk={{ android_sdk_location }} > {{ android_report_file }}"
   become_user: "{{ user }}"
   when: coding == true