From f86ec47f86b1ee3bae2a2f81e00796db903c208c Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 25 Jul 2022 15:08:33 +0200 Subject: [PATCH] ci: don't use ANDROID_NDK_HOME environment variable in Android workflow --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6c417da08..5c83312be 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -63,13 +63,13 @@ jobs: - name: Verify sdl2-config if: ${{ matrix.platform.name == 'CMake' }} run: | - export CC="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}" + export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}" export PATH=${{ env.SDL2_DIR }}/bin:$PATH cmake/test/test_sdlconfig.sh - name: Verify sdl2.pc if: ${{ matrix.platform.name == 'CMake' }} run: | - export CC="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}" + export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}" export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig cmake/test/test_pkgconfig.sh - name: Verify Android.mk