Skip to content

Commit cb04530

Browse files
committed
fix: use runner preinstalled NDK for android quiche build
nttld/setup-ndk r26d was missing its clang toolchain, failing BoringSSL cmake configure. Use the runner's complete preinstalled NDK instead.
1 parent 62d62b7 commit cb04530

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

.github/workflows/build-quiche.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,18 @@ jobs:
9999
if: runner.os == 'Windows'
100100
uses: ilammy/setup-nasm@v1
101101

102-
- name: Set up Android NDK
103-
if: matrix.platform == 'android'
104-
uses: nttld/setup-ndk@v1
105-
id: setup-ndk
106-
with:
107-
ndk-version: r26d
108-
local-cache: true
109-
110102
- name: Install cargo-ndk (Android)
111103
if: matrix.platform == 'android'
112104
run: cargo install cargo-ndk --locked
113105

114106
- name: Build quiche
115107
shell: bash
116-
env:
117-
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
118-
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
119108
run: |
109+
# Android: use the runner's preinstalled (complete) NDK. build-quiche.py
110+
# picks ANDROID_NDK_HOME / _ROOT / _LATEST_HOME from the environment.
111+
if [ "${{ matrix.platform }}" = "android" ]; then
112+
echo "Using NDK: ${ANDROID_NDK_HOME:-$ANDROID_NDK_ROOT:-$ANDROID_NDK_LATEST_HOME}"
113+
fi
120114
python3 build-quiche.py ${{ matrix.platform }} \
121115
-archs "${{ matrix.arch }}" \
122116
-version "${{ inputs.quiche_version || '0.24.6' }}" \

0 commit comments

Comments
 (0)