From beb1dbb757eb931edb153be1e3c0aa04331e34f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= <polz@fri.uni-lj.si>
Date: Sat, 30 Aug 2025 13:10:28 +0200
Subject: [PATCH] Fix Android install on Windows, install to large_prog_dir

---
 roles/android_studio/tasks/main_win.yml | 93 ++++++++++++++++---------
 1 file changed, 60 insertions(+), 33 deletions(-)

diff --git a/roles/android_studio/tasks/main_win.yml b/roles/android_studio/tasks/main_win.yml
index a209379..e4de8ee 100644
--- a/roles/android_studio/tasks/main_win.yml
+++ b/roles/android_studio/tasks/main_win.yml
@@ -1,27 +1,68 @@
 - name: Set Android Studio version
   set_fact:
-    sdk_path: C:\android-sdk
-    studio_version: "2025.1.2.11"
-    tools_version: "latest"
+    studio_path: "{{ large_prog_dir }}\\android-studio"
+    studio_version: "2025.1.2.13"
+    tools_version: "13114758_latest"
+
+- name: Set Android command-line tools path
+  set_fact:
+    tools_path: "{{ studio_path }}\\cmdline-tools\\latest"
+
+- name: Check Android Studio
+  win_stat:
+    path: "{{ studio_path }}\\bin\\studio64.exe"
+  register: studio
+
+- when: not studio.stat.exists
+  block:
+    - name: Download Android Studio
+      win_get_url:
+        url: "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/{{ studio_version }}/android-studio-{{ studio_version }}-windows.zip"
+        dest: "{{ large_prog_dir }}\\"
+
+    - name: Extract Android Studio
+      win_unzip:
+        src: "{{ large_prog_dir }}\\android-studio-{{ studio_version }}-windows.zip"
+        dest: "{{ large_prog_dir }}\\"
+        delete_archive: yes
 
 - name: Check Android Studio tools
   win_stat:
-    path: "{{ sdk_path }}\\platform-tools\\adb.exe"
+    path: "{{ tools_path }}\\bin\\sdkmanager.bat"
   register: tools
 
 - when: not tools.stat.exists
   block:
     - name: Download Android Studio tools
       win_get_url:
-        # url: "https://dl.google.com/android/repository/commandlinetools-win-{{ tools_version }}.zip"
-        url: "https://dl.google.com/android/repository/platform-tools-{{ tools_version }}-windows.zip"
-        dest: C:\
+        url: "https://dl.google.com/android/repository/commandlinetools-win-{{ tools_version }}.zip"
+        # url: "https://dl.google.com/android/repository/platform-tools-{{ tools_version }}-windows.zip"
+        dest: "{{ studio_path }}"
 
     - name: Extract Android Studio tools
       win_unzip:
-        src: "C:\\platform-tools-{{ tools_version }}-windows.zip"
-        dest: "{{ sdk_path }}\\"
+        # src: "{{ large_prog_dir }}\\platform-tools-{{ tools_version }}-windows.zip"
+        src: "{{ studio_path}}\\commandlinetools-win-{{ tools_version }}.zip"
+        dest: "{{ studio_path }}\\cmdline-tools\\"
         delete_archive: yes
+    - name: Move cmdline-tools to expected location
+      ansible.windows.win_powershell:
+        script: move "{{ studio_path }}\\cmdline-tools\\cmdline-tools" "{{ tools_path }}"
+
+- name: Create Android Studio data directory
+  win_file:
+    path: "{{ large_prog_dir }}\\.android"
+    state: directory
+
+- name: Set Android Studio environment variables
+  win_environment:
+    level: machine
+    variables:
+      ANDROID_HOME: "{{ studio_path }}"
+      ANDROID_SDK_ROOT: "{{ studio_path }}"
+      ANDROID_PREFS_ROOT: "{{ large_prog_dir }}\\"
+      GRADLE_USER_HOME: "{{ large_prog_dir }}\\.gradle"
+
 
 # - name: Accept Android SDK licenses
 #   win_shell: sh -c "yes | /c/android-sdk/cmdline-tools/cmdline-tools/bin/sdkmanager.bat --licenses"
@@ -29,35 +70,21 @@
 - name: Include Android SDK packages
   include_vars: androidsdk_packages.yml
 
-#- name: Install Android SDK
-#  win_shell: |
-#    {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ item }}"
-#  loop: "{{ AndroidSDK_packages }}"
+- name: Install Android SDK packages
+  win_shell: |
+    {{ tools_path }}\bin\sdkmanager.bat --install "{{ item }}"
+  loop: "{{ AndroidSDK_packages }}"
 
 
 # {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "{{ AndroidSDK_packages | join(' ') }}"
 # {{ sdk_path }}\\cmdline-tools\\cmdline-tools\\bin\\sdkmanager --install "build-tools;33.0.0" "cmdline-tools;latest" "emulator" "ndk-bundle" "ndk;25.1.8937393" "platform-tools" "platforms;android-33" "sources;android-33" "system-images;android-33;google_apis;arm64-v8a" "system-images;android-33;google_apis;x86_64"
 
-- name: Install Android Studio
-  win_package:
-    path: "https://redirector.gvt1.com/edgedl/android/studio/install/{{ studio_version }}/android-studio-{{ studio_version }}-windows.exe"
-    arguments: /S /AllUsers
-    expected_return_code: [0, 1223, 3010]
-    creates_path: "%ProgramFiles%\\Android\\Android Studio\\bin\\studio64.exe"
-
-- name: Create Android Studio data directory
-  win_file:
-    path: D:\.android
-    state: directory
-
-- name: Set Android Studio environment variables
-  win_environment:
-    level: machine
-    variables:
-      ANDROID_HOME: "{{ sdk_path }}"
-      ANDROID_PREFS_ROOT: D:\
-      GRADLE_USER_HOME: D:\.gradle
-
+#- name: Install Android Studio
+#  win_package:
+#    path: "https://redirector.gvt1.com/edgedl/android/studio/install/{{ studio_version }}/android-studio-{{ studio_version }}-windows.exe"
+#    arguments: /S /AllUsers
+#    expected_return_code: [0, 1223, 3010]
+#    creates_path: "%ProgramFiles%\\Android\\Android Studio\\bin\\studio64.exe"
 #- name: Check HAXM install status
 #  win_stat:
 #    path: "%ProgramFiles%\\Intel\\HAXM"