Revert "Bump Android NDK version"

This reverts commit 0fc8151.
equalitie · Jun 26, 2024 · 9261d10 · 9261d10
1 parent 99578cb
commit 9261d10
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/bindings/dart/android/build.gradle b/bindings/dart/android/build.gradle
@@ -41,9 +41,7 @@ android {
     }
 
     compileSdkVersion 34
-
-    // At time of writing, this is the LTS version
-    ndkVersion '26.3.11579264'
+    ndkVersion '25.2.9519653'
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -108,8 +106,8 @@ cargo {
     // More info: https://github.com/bbqsrc/cargo-ndk/issues/94.
     exec { spec, toolchain ->
         if (toolchain.target == 'x86_64-linux-android') {
-            def clangVersion = '17'
-            def libDir = "${android.sdkDirectory}/ndk/${android.ndkVersion}/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/${clangVersion}/lib/linux"
+            def clangVersion = '14.0.7'
+            def libDir = "${android.sdkDirectory}/ndk/${android.ndkVersion}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/${clangVersion}/lib/linux"
 
             spec.environment('RUSTFLAGS', "-L${libDir} -lstatic=clang_rt.builtins-x86_64-android")
         }

diff --git a/bindings/kotlin/lib/build.gradle b/bindings/kotlin/lib/build.gradle
@@ -17,9 +17,7 @@ def ouisyncVersionName = localProperties.getProperty("versionName")
 
 android {
     compileSdkVersion 34
-
-    // At time of writing, this is the LTS version
-    ndkVersion '26.3.11579264'
+    ndkVersion '25.2.9519653'
 
     namespace 'org.equalitie.ouisync'
 
@@ -95,8 +93,8 @@ cargo {
     // More info: https://github.com/bbqsrc/cargo-ndk/issues/94.
     exec { spec, toolchain ->
         if (toolchain.target == 'x86_64-linux-android') {
-            def clangVersion = '17'
-            def libDir = "${android.sdkDirectory}/ndk/${android.ndkVersion}/toolchains/llvm/prebuilt/linux-x86_64/lib/clang/${clangVersion}/lib/linux"
+            def clangVersion = '14.0.7'
+            def libDir = "${android.sdkDirectory}/ndk/${android.ndkVersion}/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/${clangVersion}/lib/linux"
 
             spec.environment('RUSTFLAGS', "-L${libDir} -lstatic=clang_rt.builtins-x86_64-android")
         }
@@ -160,4 +158,4 @@ tasks.withType(Sign).configureEach {
     onlyIf { rootProject.gradle.startParameter.taskNames.contains('lib:publishToSonatype') }
 }
 
-apply from: "${rootProject.projectDir}/build-scripts/publish-module.gradle"
+apply from: "${rootProject.projectDir}/build-scripts/publish-module.gradle"