From 5a1bacdba67e57278b869dde2fb7e28b43fa2ea9 Mon Sep 17 00:00:00 2001 From: biroder <107300789+biroder@users.noreply.github.com> Date: Sat, 5 Oct 2024 18:18:24 +0300 Subject: [PATCH] Fix Android CI build and revert to the previous version of the NDK --- .github/workflows/ci.yml | 4 ++++ app/app/build.gradle | 2 +- app/app/packages.txt | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 app/app/packages.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 842d30c..a5f7c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,6 +157,10 @@ jobs: cargo -vV cargo install cargo-ndk + - name: Install development kits + run: | + $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install --package_file=app/app/packages.txt + - name: Build run: | if [ "${{ github.ref_type }}" == "tag" ]; then diff --git a/app/app/build.gradle b/app/app/build.gradle index 6e90af5..7940a4a 100644 --- a/app/app/build.gradle +++ b/app/app/build.gradle @@ -7,7 +7,7 @@ android { namespace "io.github.doukutsu_rs" compileSdkVersion 33 buildToolsVersion "33.0.0" - ndkVersion "27.0.12077973" + ndkVersion "25.2.9519653" defaultConfig { applicationId "io.github.doukutsu_rs" diff --git a/app/app/packages.txt b/app/app/packages.txt new file mode 100644 index 0000000..f5d3399 --- /dev/null +++ b/app/app/packages.txt @@ -0,0 +1,3 @@ +ndk;25.2.9519653 +build-tools;33.0.0 +platforms;android-33 \ No newline at end of file