Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts(toolchain): Update to ndk-r27b #21412

Merged
merged 1 commit into from
Sep 9, 2024
Merged

scripts(toolchain): Update to ndk-r27b #21412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ndk-patches/27/bits-struct_file.h.patch → ndk-patches/27b/bits-struct_file.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/dirent.h.patch → ndk-patches/27b/dirent.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/grp.h.patch → ndk-patches/27b/grp.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/linux-fcntl.h.patch → ndk-patches/27b/linux-fcntl.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/paths.h.patch → ndk-patches/27b/paths.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/pwd.h.patch → ndk-patches/27b/pwd.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/redefine-TCSAFLUSH.patch → ndk-patches/27b/redefine-TCSAFLUSH.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/semaphore.h.patch → ndk-patches/27b/semaphore.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/stdio.h.patch → ndk-patches/27b/stdio.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/stdlib.h.patch → ndk-patches/27b/stdlib.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/sys-cdefs.h.patch → ndk-patches/27b/sys-cdefs.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/sys-time.h.patch → ndk-patches/27b/sys-time.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/syslog.patch → ndk-patches/27b/syslog.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/time.h.patch → ndk-patches/27b/time.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/unistd.h.patch → ndk-patches/27b/unistd.h.patch
View file
Open in desktop
File renamed without changes.
0 ndk-patches/27/utmp.h.patch → ndk-patches/27b/utmp.h.patch
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/build/termux_step_setup_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ld/toolchain/termux_setup_toolchain_27.sh → ...d/toolchain/termux_setup_toolchain_27b.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
termux_setup_toolchain_27() {
termux_setup_toolchain_27b() {
export CFLAGS=""
export CPPFLAGS=""
export LDFLAGS="-L${TERMUX_PREFIX}/lib"
Expand Down
2 changes: 1 addition & 1 deletion scripts/properties.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup-android-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down