From 257e4a30e011a6b9daa87e8e4e592ba0f399d32f Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 11 May 2024 19:34:14 -0700
Subject: [PATCH] wip

---
 .github/actions/android-ndk/action.yml |  4 +++-
 .github/workflows/main.yml             | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/actions/android-ndk/action.yml b/.github/actions/android-ndk/action.yml
index 57fee7eba25f..7312e0bc0fa2 100644
--- a/.github/actions/android-ndk/action.yml
+++ b/.github/actions/android-ndk/action.yml
@@ -13,6 +13,8 @@ inputs:
 runs:
   using: composite
   steps:
+    - run: find $ANDROID_NDK
+      shell: bash
     - name: Set Up JDK 17
       uses: actions/setup-java@v4
       with:
@@ -28,5 +30,5 @@ runs:
       shell: bash
     - run: cargo install --root ${{ runner.tool_cache }}/cargo-ndk --version ${{ inputs.cargo-ndk }} cargo-ndk --locked
       shell: bash
-    - run: cargo ndk-env -t ${{ inputs.android-target }} --json | jq -r 'to_entries[] | [.key, .value] | @tsv' | sed 's/\t/=/' >> $GITHUB_ENV
+    - run: cargo ndk-env -t ${{ inputs.android-target }} --json | jq -r 'to_entries[] | [.key, .value] | @tsv' | sed 's/\t/=/' | grep -v LINKER >> $GITHUB_ENV
       shell: bash
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a4195840eff8..f04f43a00cce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -179,6 +179,19 @@ jobs:
       preview1-adapter: ${{ steps.calculate.outputs.preview1-adapter }}
     steps:
     - uses: actions/checkout@v4
+    - run: find $ANDROID_NDK
+    - run: $ANDROID_NDK/ndk-which --abi x86_64 clang
+      continue-on-error: true
+    - run: $ANDROID_NDK/ndk-which --abi arm64-v8a clang
+      continue-on-error: true
+    - run: $ANDROID_NDK/ndk-which --abi arm64-v8a gcc
+      continue-on-error: true
+    - run: $ANDROID_NDK/ndk-which --abi arm64-v8a cc
+      continue-on-error: true
+    - run: $ANDROID_NDK/ndk-which --abi arm64-v8a gdb
+      continue-on-error: true
+    - run: $ANDROID_NDK/ndk-which --abi arm64-v8a objdump
+      continue-on-error: true
     - id: calculate
       env:
         GH_TOKEN: ${{ github.token }}