Merge pull request zingolabs#776 from juanky201271/dev_upgrade_ndk_r26d

dorianvp · web-flow · commit cb051cd84300 · 2025-02-13T01:49:51.000-03:00
Cargo update &amp; NDK upgrade to r26d
diff --git a/.github/workflows/android-build.yaml b/.github/workflows/android-build.yaml
@@ -62,7 +62,7 @@ jobs:
     if: ${{ needs.android-check-build-cache.outputs.native-cache-found != 'true' || needs.android-check-build-cache.outputs.kotlin-cache-found != 'true' }}
     runs-on: ubuntu-22.04
     container:
-      image: zingodevops/android_builder:010
+      image: zingodevops/android_builder:011
     env:
       RUSTUP_HOME: /root/.rustup
     steps:
diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
+        ndkVersion = "26.3.11579264"
         kotlinVersion = "1.9.22"
     }
     repositories {
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Dockerfile b/rust/Dockerfile
@@ -1,4 +1,4 @@
-FROM zingodevops/android_builder:010 as build_android
+FROM zingodevops/android_builder:011 as build_android
 
 WORKDIR /opt/zingo/rust/lib/
 
diff --git a/rust/android/builder/Dockerfile b/rust/android/builder/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:latest
-ARG android_ndk_ver=r24
-# 24.0.8215888
+ARG android_ndk_ver=r26d
+# 26.3.11579264
 
 # Install dependencies
 RUN apt update \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM zingodevops/android_builder:010 as build_android`
	`1`	`+FROM zingodevops/android_builder:011 as build_android`
`2`	`2`
`3`	`3`	`WORKDIR /opt/zingo/rust/lib/`
`4`	`4`