Skip to content

Commit a9724f3

Browse files
committed
android: Update to NDK r26b, current LTS
1 parent 2fef4b4 commit a9724f3

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

config.example.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
#metrics = false
393393

394394
# Specify the location of the Android NDK. Used when targeting Android.
395-
#android-ndk = "/path/to/android-ndk-r25b"
395+
#android-ndk = "/path/to/android-ndk-r26b"
396396

397397
# =============================================================================
398398
# General install configuration options

src/bootstrap/src/utils/cc_detect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ pub(crate) fn ndk_compiler(compiler: Language, triple: &str, ndk: &Path) -> Path
248248
} else if cfg!(target_os = "windows") {
249249
"windows-x86_64"
250250
} else {
251-
// NDK r25b only has official releases for macOS, Windows and Linux.
251+
// NDK r26b only has official releases for macOS, Windows and Linux.
252252
// Try the Linux directory everywhere else, on the assumption that the OS has an
253253
// emulation layer that can cope (e.g. BSDs).
254254
"linux-x86_64"

src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
170170
severity: ChangeSeverity::Warning,
171171
summary: "`rust.split-debuginfo` has been moved to `target.<triple>.split-debuginfo` and its default value is determined for each target individually.",
172172
},
173+
ChangeInfo {
174+
change_id: 120593,
175+
severity: ChangeSeverity::Info,
176+
summary: "Removed android-ndk r25b support in favor of android-ndk r26b.",
177+
},
173178
];

src/ci/docker/host-x86_64/aarch64-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN sh /scripts/android-base-apt-get.sh
66

77
COPY scripts/android-ndk.sh /scripts/
88
RUN . /scripts/android-ndk.sh && \
9-
download_ndk android-ndk-r25b-linux.zip
9+
download_ndk android-ndk-r26b-linux.zip
1010

1111
RUN dpkg --add-architecture i386 && \
1212
apt-get update && \

src/ci/docker/host-x86_64/dist-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN sh /scripts/android-base-apt-get.sh
66
# ndk
77
COPY scripts/android-ndk.sh /scripts/
88
RUN . /scripts/android-ndk.sh && \
9-
download_ndk android-ndk-r25b-linux.zip
9+
download_ndk android-ndk-r26b-linux.zip
1010

1111
# env
1212
ENV TARGETS=arm-linux-androideabi

0 commit comments

Comments
 (0)