use libdrm crossfile and don't compile turnip

SolDev69 · Jul 21, 2024 · a281e43 · a281e43
1 parent 1d10fa0
commit a281e43
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/workflows/pojav-gallium.yml b/.github/workflows/pojav-gallium.yml
@@ -61,24 +61,23 @@ jobs:
             -Dshared-glapi=false \
             -Dbuildtype=release
           ninja -C "build-android" install
-          envsubst <android-turnip-${{matrix.arch}} >build-crossfile-turnip
           meson setup "build-android-turnip" \
-            --cross-file "build-crossfile-turnip" \
+            --cross-file "build-crossfile" \
             -Dbuildtype=release \
             --prefix=/tmp/mesa \
             -Dplatforms=android \
             -Dplatform-sdk-version=33 \
             -Dandroid-stub=true \
             -Dgallium-drivers= \
-            -Dvulkan-drivers=freedreno,virtio-experimental \
+            -Dvulkan-drivers=virtio-experimental \
             -Dfreedreno-kgsl=true \
             -Db_lto=true
           ninja -C "build-android-turnip" install
           cd /tmp/mesa/lib
           mv libOSMesa.so libOSMesa_znL.so
 
           mkdir /tmp/mesa/toupload
-          cp /tmp/mesa/lib/libOSMesa_znL.so /tmp/mesa/lib/libvulkan_freedreno.so /tmp/mesa/lib/libvulkan_virtio.so /tmp/mesa/toupload/
+          cp /tmp/mesa/lib/libOSMesa_znL.so /tmp/mesa/lib/libvulkan_virtio.so /tmp/mesa/toupload/
 
       - name: Upload libraries
         uses: actions/upload-artifact@v2