From d1deb557fe7662003b35967cd6d74729d91f3d6f Mon Sep 17 00:00:00 2001
From: SolDev69 <40839581+SolDev69@users.noreply.github.com>
Date: Sat, 23 Dec 2023 00:56:02 +0000
Subject: [PATCH] rewrite ci

Change-Id: I16a89d4cdf5874d72e2ad3b01f95923aab084aaf
---
 .github/workflows/android.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 1ef53569eb..d846d48838 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -38,19 +38,15 @@ jobs:
         shell: bash
         run: |
           cd swiftshader
-          export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH
+          # export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH
           git submodule init
+          cd build
+          export CMAKE_C_COMPILER=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android25-clang
+          export CMAKE_CXX_COMPILER=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android25-clang++
+          export CMAKE_ASM_COMPILER=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
 
-          cmake \
-            -G Ninja \
-            -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_BUILD_TYPE=Release \
-            -D SWIFTSHADER_WARNINGS_AS_ERRORS=off \
-            -B build
-
-          ninja -C build
           mkdir /tmp/swiftshader
-          mv build/libvk_swiftshader.so /tmp/swiftshader
+          mv build/libvk_swiftshader.so /tmp/swiftshader -v
 
       - name: Upload libraries
         uses: actions/upload-artifact@v2