diff --git a/.gitea/workflows/pixel10.yml b/.gitea/workflows/pixel10.yml index aabebdec..734313cf 100644 --- a/.gitea/workflows/pixel10.yml +++ b/.gitea/workflows/pixel10.yml @@ -86,11 +86,12 @@ jobs: run: | set -euo pipefail android_api="$(sed -n 's/^[[:space:]]*compileSdkVersion[[:space:]]*=[[:space:]]*//p' apps/weblibre/android/build.gradle | head -n 1)" + android_platform="$android_api.0" ndk_version="$(sed -n 's/^weblibre\.ndkVersion[[:space:]]*=[[:space:]]*//p' apps/weblibre/android/gradle.properties)" test -n "$android_api" test -n "$ndk_version" - yes | sdkmanager --channel=3 --install "platforms;android-$android_api" "ndk;$ndk_version" || test "${PIPESTATUS[1]}" -eq 0 - test -f "$ANDROID_HOME/platforms/android-$android_api/android.jar" + yes | sdkmanager --channel=3 --install "platforms;android-$android_platform" "ndk;$ndk_version" || test "${PIPESTATUS[1]}" -eq 0 + test -f "$ANDROID_HOME/platforms/android-$android_platform/android.jar" test -f "$ANDROID_HOME/ndk/$ndk_version/source.properties" { echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndk_version"