From 9d8e796b4fcfa217942a0231dcad8dfd7c1d43d3 Mon Sep 17 00:00:00 2001 From: Max Ammann Date: Mon, 2 May 2022 15:05:44 +0200 Subject: [PATCH] Export toolchain tools (#61) * Export toolchain tools * Fix environment --- .github/actions/android/action.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/actions/android/action.yml b/.github/actions/android/action.yml index 908fb17d..fe69f6c5 100644 --- a/.github/actions/android/action.yml +++ b/.github/actions/android/action.yml @@ -12,9 +12,15 @@ runs: - name: Build shell: bash run: just build-android -# - name: Check x86_64 -# shell: bash -# run: just check maplibre-android x86_64-linux-android -# - name: Check aarch64 -# shell: bash -# run: just check maplibre-android aarch64-linux-android + - name: Check x86_64 + shell: bash + run: | + env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" \ + env "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" \ + just check maplibre-android x86_64-linux-android + - name: Check aarch64 + shell: bash + run: | + env "AR_aarch64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" \ + env "CC_aarch64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android30-clang" \ + just check maplibre-android aarch64-linux-android