feat(INFRA-2821): use android from runner

Author: makemesteaks

.github/actions/setup-e2e-env/action.yml

@@ -214,15 +214,7 @@ runs:
       run: xcrun simctl list devices
       shell: bash
 
-    ## Android Setup ##
-
-    ## JDK Setup
-    - name: Setup Java
-      if: ${{ inputs.platform == 'android' }}
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
-      with:
-        java-version: ${{ inputs.jdk-version }}
-        distribution: ${{ inputs.jdk-distribution }}
+    ## Android Setup - Minimal (Runner handles SDK/NDK) ##
 
     - name: Configure Android Signing Certificates
       if: ${{ inputs.platform == 'android' && inputs.configure-keystores == 'true' }}
@@ -233,78 +225,44 @@ runs:
         platform: 'android'
         environment: ${{ inputs.environment }}
 
-    #- name: Enable KVM group perms (Ubuntu only)
-    #  if: ${{ inputs.platform == 'android' && runner.os == 'Linux' }}
-    #  run: |
-    #    echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-    #    sudo udevadm control --reload-rules
-    #    sudo udevadm trigger --name-match=kvm
-    #  shell: bash
-
-    ## Android SDK Setup
-
-    - name: Install required emulator dependencies
-      if: ${{ inputs.platform == 'android' && runner.os == 'Linux' }}
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y \
-          libpulse0 \
-          libglu1-mesa \
-          libnss3 \
-          libxss1
-
-        echo "✅ Linux dependencies installed successfully"
-      shell: bash
-
-    - name: Install Android SDK packages
+    - name: Setup Android environment variables
       if: ${{ inputs.platform == 'android' }}
       run: |
-        echo "Accepting SDK licenses..."
-        printf 'y\n%.0s' {1..10} | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --licenses
-
-        echo "Installing Android SDK components..."
-        "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --install \
-          "platform-tools" \
-          "platforms;android-${{ inputs.android-api-level }}" \
-          "build-tools;34.0.0" \
-          "emulator" \
-          "system-images;android-${{ inputs.android-api-level }};google_apis;${{ inputs.android-abi }}" \
-
-        echo "Updating SDK packages..."
-        "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --update
-
-        echo "✅ Android SDK packages installed successfully"
-      shell: bash
-
-    ## NDK Setup
-
-    - name: Debug Android SDK Paths
-      if: ${{ inputs.platform == 'android' }}
-      run: |
-        echo "ANDROID_HOME: $ANDROID_HOME"
+        echo "Setting up Android environment variables..."
+        echo "ANDROID_HOME=${ANDROID_SDK_ROOT}" >> "$GITHUB_ENV"
+        echo "PATH=${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/emulator" >> "$GITHUB_ENV"
+        
+        echo "ANDROID_HOME: ${ANDROID_SDK_ROOT}"
         echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT"
+        echo "ANDROID_NDK_HOME: $ANDROID_NDK_HOME"
       shell: bash
 
-    - name: Install Android NDK
-      if: ${{ inputs.platform == 'android' }}
-      run: |
-        "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "ndk;${{ inputs.ndk-version }}"
-      shell: bash
-
-    - name: Add Android tools to PATH
-      if: ${{ inputs.platform == 'android' }}
-      run: |
-        echo "$ANDROID_HOME/platform-tools" >> "$GITHUB_PATH"
-        echo "$ANDROID_HOME/emulator" >> "$GITHUB_PATH"
-        echo "$ANDROID_HOME/cmdline-tools/latest/bin" >> "$GITHUB_PATH"
-      shell: bash
-
-    - name: Add NDK related toolchains to PATH
+    - name: Verify Android SDK from Docker
       if: ${{ inputs.platform == 'android' }}
       run: |
-        NDK_TOOLCHAIN="$ANDROID_SDK_ROOT/ndk/${{ inputs.ndk-version }}/toolchains/llvm/prebuilt/linux-x86_64/bin"
-        echo "$NDK_TOOLCHAIN" >> "$GITHUB_PATH"
-        echo "$ANDROID_SDK_ROOT/ndk/${{ inputs.ndk-version }}" >> "$GITHUB_PATH"
+        echo "Verifying Android SDK installation from Docker..."
+        if [ -d "$ANDROID_SDK_ROOT" ]; then
+          echo "✅ Android SDK found at: $ANDROID_SDK_ROOT"
+          ls -la "$ANDROID_SDK_ROOT/"
+          
+          # Verify key tools are available
+          if [ -f "${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager" ]; then
+            echo "✅ avdmanager found"
+          else
+            echo "❌ avdmanager not found"
+            exit 1
+          fi
+          
+          if [ -f "${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" ]; then
+            echo "✅ sdkmanager found"
+          else
+            echo "❌ sdkmanager not found"
+            exit 1
+          fi
+        else
+          echo "❌ Android SDK not found at: $ANDROID_SDK_ROOT"
+          exit 1
+        fi
       shell: bash
 
     ## Launch AVD