From 5ac3b9cf6e3d914a03bbedba2fbd7a4cbab2a4e7 Mon Sep 17 00:00:00 2001 From: Artur Skubei <41114720+gdlbo@users.noreply.github.com> Date: Sun, 25 Feb 2024 22:07:42 +0300 Subject: [PATCH] Another ndk fix (#1572) --- .github/workflows/build.yml | 8 ++++---- app/build.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81b81d2a8..3ccf49af8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,16 +28,14 @@ jobs: uses: nttld/setup-ndk@v1 with: ndk-version: r25c - link-to-sdk: true + add-to-path: false - name: Set up JDK uses: actions/setup-java@v3 with: java-version: '17' distribution: 'adopt' - - - uses: actions/checkout@v3 - + - name: Download tools run: | sudo apt update @@ -56,6 +54,8 @@ jobs: java -jar scripts/apktool.jar b smali -o smali/VTLite.apk --use-aapt2 -p scripts/framework/ zipalign -p -f 4 smali/VTLite.apk smali/VTLite.apk_aligned mv smali/VTLite.apk_aligned smali/VTLite.apk + env: + ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} - name: Sign and verify the apk run: | diff --git a/app/build.gradle b/app/build.gradle index c1b2a4af1..728b02f73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ android { targetCompatibility JavaVersion.VERSION_14 } namespace 'ru.vtosters.lite' - ndkVersion '26.1.10909125' + ndkVersion '25.2.9519653' buildFeatures { aidl true }