android: Slightly increase NDK version

This version was installed in the base image until Aug 1st (the other we
installed was not actually used for a while).

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d1b909dc1c830b1f924867792b3529819ce2e461..954f8107157c2e56410c3b959d8661a2cf0dffed 100644 (file)
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -29,11 +29,11 @@ jobs:
       # since the NDK is newly installed every time, we have to use this to avoid cache misses
       CCACHE_COMPILERCHECK: content
     steps:
-      # even though we don't specify a specific version in our gradle files, the
-      # build fails without this because some arbitrary NDK version, that's
-      # weirdly not installed, is requested
+      # we currently don't specify a specific NDK version in our gradle files,
+      # so we load the version the Gradle Plugin uses as default but which is
+      # not installed anymore in the image
       - name: Install NDK
-        run: yes | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install 'ndk;21.0.6113669'
+        run: yes | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install 'ndk;21.4.7075529'
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
         with:

diff --git a/scripts/test.sh b/scripts/test.sh
index bc10785e89b5cafb175ef1929c238a89ec934097..33661a22c81c10343b43b8c313e53d7124918388 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -522,7 +522,7 @@ android)
        rm -r strongswan-*
        cd src/frontends/android
        echo "$ ./gradlew build"
-       NDK_CCACHE=ccache ./gradlew build || exit $?
+       NDK_CCACHE=ccache ./gradlew build --info || exit $?
        ;;
 *)
        ;;