Skip to content

Commit 7a9fcb7

Browse files
committed
Fix Android SDK discovery on self-hosted runner
1 parent af5417e commit 7a9fcb7

1 file changed

Lines changed: 17 additions & 3 deletions

File tree

‎.github/workflows/ffmpeg-dependencies.yml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,24 @@ jobs:
3232
- name: Initialize pinned vcpkg
3333
run: git submodule update --init ffmpeg/vcpkg
3434

35-
- name: Install Android NDK r29
35+
- name: Locate Android NDK r29
3636
run: |
37-
sdkmanager "ndk;29.0.14206865"
38-
echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/29.0.14206865" >> "$GITHUB_ENV"
37+
sdk_root="${ANDROID_SDK_ROOT:-${ANDROID_HOME:-$HOME/Library/Android/sdk}}"
38+
ndk_root="$sdk_root/ndk/29.0.14206865"
39+
40+
if [[ ! -f "$ndk_root/build/cmake/android.toolchain.cmake" ]]; then
41+
sdkmanager="$sdk_root/cmdline-tools/latest/bin/sdkmanager"
42+
if [[ ! -x "$sdkmanager" ]]; then
43+
echo "::error::Android SDK Command-line Tools are not installed: $sdkmanager"
44+
exit 1
45+
fi
46+
"$sdkmanager" --sdk_root="$sdk_root" "ndk;29.0.14206865"
47+
fi
48+
49+
test -f "$ndk_root/build/cmake/android.toolchain.cmake"
50+
echo "ANDROID_HOME=$sdk_root" >> "$GITHUB_ENV"
51+
echo "ANDROID_SDK_ROOT=$sdk_root" >> "$GITHUB_ENV"
52+
echo "ANDROID_NDK_HOME=$ndk_root" >> "$GITHUB_ENV"
3953
4054
- name: Restore vcpkg binary cache
4155
uses: actions/cache@v4

0 commit comments

Comments
 (0)