diff --git a/.github/workflows/pojav-gallium.yml b/.github/workflows/pojav-gallium.yml index 0e6c28144f3..e4de9b00045 100644 --- a/.github/workflows/pojav-gallium.yml +++ b/.github/workflows/pojav-gallium.yml @@ -48,7 +48,7 @@ jobs: --prefix=/tmp/mesa \ --cross-file "build-crossfile" \ -Dplatforms=android \ - -Dplatform-sdk-version=26 \ + -Dplatform-sdk-version=25 \ -Dandroid-stub=true \ -Dandroid-strict=false \ -Dllvm=disabled \ diff --git a/android-aarch64 b/android-aarch64 index 0a3f8172f2c..05c255e1da3 100644 --- a/android-aarch64 +++ b/android-aarch64 @@ -1,7 +1,7 @@ [binaries] ar = '$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar' -c = ['ccache', '$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android25-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] -cpp = ['ccache', '$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android25-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c = ['ccache', '$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC'] +cpp = ['ccache', '$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++', '-O3', '-DVK_USE_PLATFORM_ANDROID_KHR', '-fPIC', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] c_ld = 'lld' cpp_ld = 'lld' strip = '$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'