From a585def9b262a9004b1aecedf8b96237971bea27 Mon Sep 17 00:00:00 2001
From: SolDev69 <40839581+SolDev69@users.noreply.github.com>
Date: Wed, 22 Nov 2023 18:47:35 -0500
Subject: [PATCH] Update android.yml

Want to see if this will work
---
 .github/workflows/android.yml | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3f4dafbc638..97fce9c83a4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -8,7 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-        arch: [ "arm32", "aarch64" ]
+        arch: [ "arm32", "aarch64", "x86_64", "i686" ]
       fail-fast: false
 
     name: "Build for ${{matrix.arch}}"
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Disable symlinks in git config
+        run: git config --global core.symlinks false
         
       - uses: actions/checkout@v2
 
@@ -25,30 +27,12 @@ jobs:
           sudo apt install -y meson libxrandr-dev libxxf86vm-dev libxcb-*-dev libx11-xcb-dev libxfixes-dev libdrm-dev libx11-dev
           pip3 install mako
           export ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk-bundle"
-          envsubst <android-drm-${{matrix.arch}} >build-crossfile-drm
-          git clone --depth 1 https://gitlab.freedesktop.org/mesa/drm.git
-          cd drm
-          meson setup "build-android" \
-            --prefix=/tmp/drm-static \
-            --cross-file "../build-crossfile-drm" \
-            -Ddefault_library=static \
-            -Dintel=disabled \
-            -Dradeon=disabled \
-            -Damdgpu=disabled \
-            -Dnouveau=disabled \
-            -Dvmwgfx=disabled \
-            -Dfreedreno=enabled \
-            -Dvc4=disabled \
-            -Detnaviv=disabled \
-            -Dfreedreno-kgsl=true
-          ninja -C "build-android" install
-          cd ..
           envsubst <android-${{matrix.arch}} >build-crossfile
           meson setup "build-android" \
-            --prefix=/tmp/fd \
+            --prefix=/tmp/zink \
             --cross-file "build-crossfile" \
             -Dplatforms=android \
-            -Dplatform-sdk-version=26 \
+            -Dplatform-sdk-version=25 \
             -Dandroid-stub=true \
             -Dllvm=disabled \
             -Dxlib-lease=disabled \
@@ -58,12 +42,11 @@ jobs:
             -Dopengl=true \
             -Dosmesa=true \
             -Dvulkan-drivers= \
-            -Dgallium-drivers=swrast,freedreno \
-            -Dfreedreno-kmds=kgsl \
+            -Dgallium-drivers=swrast,zink \
             -Dshared-glapi=false
           ninja -C "build-android" install
       - name: Upload libraries
         uses: actions/upload-artifact@v2
         with:
-          name: freedreno_${{matrix.arch}}
-          path: /tmp/fd
+          name: libzink_${{matrix.arch}}
+          path: /tmp/zink