scripts(toolchain): Update to ndk-r27b

termux · Sep 9, 2024 · 8819273 · 8819273
1 parent 3e4b96d
commit 8819273
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 8 deletions.
diff --git a/build-package.sh b/build-package.sh
@@ -237,8 +237,8 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_handle_host_build.sh"
 source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_host_build.sh"
 
 # Setup a standalone Android NDK toolchain. Called from termux_step_setup_toolchain.
-# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_27.sh
-source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_27.sh"
+# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_27b.sh
+source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_27b.sh"
 
 # Setup a standalone Android NDK 23c toolchain. Called from termux_step_setup_toolchain.
 # shellcheck source=scripts/build/toolchain/termux_setup_toolchain_23c.sh

diff --git a/ndk-patches/27/bits-struct_file.h.patch → ndk-patches/27b/bits-struct_file.h.patch b/ndk-patches/27/bits-struct_file.h.patch → ndk-patches/27b/bits-struct_file.h.patch
diff --git a/ndk-patches/27/dirent.h.patch → ndk-patches/27b/dirent.h.patch b/ndk-patches/27/dirent.h.patch → ndk-patches/27b/dirent.h.patch
diff --git a/ndk-patches/27/grp.h.patch → ndk-patches/27b/grp.h.patch b/ndk-patches/27/grp.h.patch → ndk-patches/27b/grp.h.patch
diff --git a/ndk-patches/27/linux-fcntl.h.patch → ndk-patches/27b/linux-fcntl.h.patch b/ndk-patches/27/linux-fcntl.h.patch → ndk-patches/27b/linux-fcntl.h.patch
diff --git a/ndk-patches/27/paths.h.patch → ndk-patches/27b/paths.h.patch b/ndk-patches/27/paths.h.patch → ndk-patches/27b/paths.h.patch
diff --git a/ndk-patches/27/pwd.h.patch → ndk-patches/27b/pwd.h.patch b/ndk-patches/27/pwd.h.patch → ndk-patches/27b/pwd.h.patch
diff --git a/ndk-patches/27/redefine-TCSAFLUSH.patch → ndk-patches/27b/redefine-TCSAFLUSH.patch b/ndk-patches/27/redefine-TCSAFLUSH.patch → ndk-patches/27b/redefine-TCSAFLUSH.patch
diff --git a/ndk-patches/27/semaphore.h.patch → ndk-patches/27b/semaphore.h.patch b/ndk-patches/27/semaphore.h.patch → ndk-patches/27b/semaphore.h.patch
diff --git a/ndk-patches/27/stdio.h.patch → ndk-patches/27b/stdio.h.patch b/ndk-patches/27/stdio.h.patch → ndk-patches/27b/stdio.h.patch
diff --git a/ndk-patches/27/stdlib.h.patch → ndk-patches/27b/stdlib.h.patch b/ndk-patches/27/stdlib.h.patch → ndk-patches/27b/stdlib.h.patch
diff --git a/ndk-patches/27/sys-cdefs.h.patch → ndk-patches/27b/sys-cdefs.h.patch b/ndk-patches/27/sys-cdefs.h.patch → ndk-patches/27b/sys-cdefs.h.patch
diff --git a/ndk-patches/27/sys-time.h.patch → ndk-patches/27b/sys-time.h.patch b/ndk-patches/27/sys-time.h.patch → ndk-patches/27b/sys-time.h.patch
diff --git a/ndk-patches/27/syslog.patch → ndk-patches/27b/syslog.patch b/ndk-patches/27/syslog.patch → ndk-patches/27b/syslog.patch
diff --git a/ndk-patches/27/time.h.patch → ndk-patches/27b/time.h.patch b/ndk-patches/27/time.h.patch → ndk-patches/27b/time.h.patch
diff --git a/ndk-patches/27/unistd.h.patch → ndk-patches/27b/unistd.h.patch b/ndk-patches/27/unistd.h.patch → ndk-patches/27b/unistd.h.patch
diff --git a/ndk-patches/27/utmp.h.patch → ndk-patches/27b/utmp.h.patch b/ndk-patches/27/utmp.h.patch → ndk-patches/27b/utmp.h.patch
diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh
@@ -6,9 +6,9 @@ termux_step_setup_toolchain() {
 		# Bump TERMUX_STANDALONE_TOOLCHAIN if a change is made in
 		# toolchain setup to ensure that everyone gets an updated
 		# toolchain
-		if [ "${TERMUX_NDK_VERSION}" = "27" ]; then
+		if [ "${TERMUX_NDK_VERSION}" = "27b" ]; then
 			TERMUX_STANDALONE_TOOLCHAIN+="-v1"
-			termux_setup_toolchain_27
+			termux_setup_toolchain_27b
 		elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
 			TERMUX_STANDALONE_TOOLCHAIN+="-v8"
 			termux_setup_toolchain_23c

diff --git a/...ld/toolchain/termux_setup_toolchain_27.sh → ...d/toolchain/termux_setup_toolchain_27b.sh b/...ld/toolchain/termux_setup_toolchain_27.sh → ...d/toolchain/termux_setup_toolchain_27b.sh
@@ -1,4 +1,4 @@
-termux_setup_toolchain_27() {
+termux_setup_toolchain_27b() {
 	export CFLAGS=""
 	export CPPFLAGS=""
 	export LDFLAGS="-L${TERMUX_PREFIX}/lib"

diff --git a/scripts/properties.sh b/scripts/properties.sh
@@ -10,7 +10,7 @@ TERMUX_ANDROID_BUILD_TOOLS_VERSION=33.0.1
 #   apksigner, d8
 # and trigger rebuild of them
 : "${TERMUX_NDK_VERSION_NUM:="27"}"
-: "${TERMUX_NDK_REVISION:=""}"
+: "${TERMUX_NDK_REVISION:="b"}"
 TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
 # when changing the above:
 # update version and hashsum in packages

diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
@@ -10,9 +10,9 @@ set -e -u
 
 ANDROID_SDK_FILE=commandlinetools-linux-${TERMUX_SDK_REVISION}_latest.zip
 ANDROID_SDK_SHA256=0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a
-if [ "$TERMUX_NDK_VERSION" = "27" ]; then
+if [ "$TERMUX_NDK_VERSION" = "27b" ]; then
 	ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip
-	ANDROID_NDK_SHA256=2f17eb8bcbfdc40201c0b36e9a70826fcd2524ab7a2a235e2c71186c302da1dc
+	ANDROID_NDK_SHA256=33e16af1a6bbabe12cad54b2117085c07eab7e4fa67cdd831805f0e94fd826c1
 elif [ "$TERMUX_NDK_VERSION" = 23c ]; then
 	ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-linux.zip
 	ANDROID_NDK_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242