From 2493ada264d121203e5413951fc192443f97a345 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Tue, 23 Jan 2024 12:51:49 +0100
Subject: [PATCH] ported CI android fixed

---
 .github/actions/environment/action.yml     | 9 +++++++++
 .github/workflows/build.yml                | 9 +++++++++
 .github/workflows/device-tests-android.yml | 6 ------
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml
index 095ff89560..3a8f31d389 100644
--- a/.github/actions/environment/action.yml
+++ b/.github/actions/environment/action.yml
@@ -11,6 +11,15 @@ runs:
         echo "DOTNET_CLI_TELEMETRY_OPTOUT=1" >> $GITHUB_ENV
         echo "DOTNET_NOLOGO=1" >> $GITHUB_ENV
 
+    # Needed for Android SDK setup step
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f # v3.2.0
+
     - name: Set Java Version
       uses: actions/setup-java@v3
       with:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 53d360977e..4da94c9ad2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,6 +55,15 @@ jobs:
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
+      # Needed for Android SDK setup step
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f # v3.2.0
+
       - name: Test
         run: dotnet test Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}"
 
diff --git a/.github/workflows/device-tests-android.yml b/.github/workflows/device-tests-android.yml
index 20835f9460..86e0d18b15 100644
--- a/.github/workflows/device-tests-android.yml
+++ b/.github/workflows/device-tests-android.yml
@@ -23,12 +23,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set Java Version
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-
       - name: Build Native Dependencies
         uses: ./.github/actions/buildnative