fix ndk issue

nymtech · Feb 23, 2024 · f0c28de · f0c28de
1 parent cc25bb7
commit f0c28de
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -43,13 +43,11 @@ jobs:
             armv7-linux-androideabi \
             x86_64-linux-android \
             i686-linux-android
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Add cargo-ndk
         run: |
           cargo install cargo-ndk
-      - name: Setup Android NDK
-        uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r23c
       # Here we need to decode keystore.jks from base64 string and place it
       # in the folder specified in the release signing configuration
       - name: Decode Keystore

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,13 +44,11 @@ jobs:
             armv7-linux-androideabi \
             x86_64-linux-android \
             i686-linux-android
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Add cargo-ndk
         run: |
           cargo install cargo-ndk
-      - name: Setup Android NDK
-        uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r23c
       # Here we need to decode keystore.jks from base64 string and place it
       # in the folder specified in the release signing configuration
       - name: Decode Keystore

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -11,7 +11,6 @@ plugins {
 android {
     namespace = "${Constants.NAMESPACE}.${Constants.APP_NAME}"
     compileSdk = Constants.COMPILE_SDK
-    ndkVersion = Constants.NDK_VERSION
 
     defaultConfig {
         applicationId = "${Constants.NAMESPACE}.${Constants.APP_NAME}"

diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -6,7 +6,6 @@ object Constants {
     const val TARGET_SDK = 34
     const val COMPILE_SDK = 34
     const val MIN_SDK = 24
-    const val NDK_VERSION = "26.1.10909125"
 
     const val JVM_TARGET = "17"
     val JAVA_VERSION = JavaVersion.VERSION_17

diff --git a/vpn-client/build.gradle.kts b/vpn-client/build.gradle.kts
@@ -12,9 +12,6 @@ android {
 
     project.tasks.preBuild.dependsOn(Constants.BUILD_LIB_TASK)
 
-    //TODO maybe we don't need this specific version but it is working
-    ndkVersion = "23.0.7599858"
-
     namespace = "${Constants.NAMESPACE}.${Constants.VPN_LIB_NAME}"
     compileSdk = 34