这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(ndk): fix on-device building and remove custom __ANDROID_API__ header patches #25786

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

Merged
merged 1 commit into from
Nov 4, 2025
Merged

fix(ndk): fix on-device building and remove custom __ANDROID_API__ header patches #25786

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: 3 additions & 1 deletion packages/libc++/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
# scripts/properties.sh
TERMUX_PKG_VERSION=28c
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc
TERMUX_PKG_SHA256=dfb20d396df28ca02a8c708314b814a4d961dc9074f9a161932746f815aa552f
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_ESSENTIAL=true
TERMUX_PKG_BUILD_IN_SRC=true
Expand All @@ -17,6 +18,7 @@ termux_step_get_source() {
termux_download_src_archive
cd $TERMUX_PKG_TMPDIR
termux_extract_src_archive
mv "$TERMUX_PKG_SRCDIR/android-ndk-r$TERMUX_PKG_VERSION"/* "$TERMUX_PKG_SRCDIR"
else
local lib_path="toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${TERMUX_HOST_PLATFORM}"
mkdir -p "$TERMUX_PKG_SRCDIR"/"$lib_path"
Expand Down
5 changes: 3 additions & 2 deletions packages/ndk-multilib/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
# scripts/properties.sh
TERMUX_PKG_VERSION=28c
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc
TERMUX_PKG_SHA256=dfb20d396df28ca02a8c708314b814a4d961dc9074f9a161932746f815aa552f
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_PLATFORM_INDEPENDENT=true
TERMUX_PKG_NO_STATICSPLIT=true
Expand All @@ -19,6 +19,7 @@ termux_step_get_source() {
termux_download_src_archive
cd $TERMUX_PKG_TMPDIR
termux_extract_src_archive
mv "$TERMUX_PKG_SRCDIR/android-ndk-r$TERMUX_PKG_VERSION"/* "$TERMUX_PKG_SRCDIR"
else
local lib_path="toolchains/llvm/prebuilt/linux-x86_64/sysroot"
mkdir -p "$TERMUX_PKG_SRCDIR"/"$lib_path"
Expand Down
6 changes: 3 additions & 3 deletions packages/ndk-sysroot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
# scripts/properties.sh
TERMUX_PKG_VERSION=28c
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc
TERMUX_PKG_SHA256=dfb20d396df28ca02a8c708314b814a4d961dc9074f9a161932746f815aa552f
TERMUX_PKG_AUTO_UPDATE=false
# This package has taken over <pty.h> from the previous libutil-dev
# and iconv.h from libandroid-support-dev:
Expand Down Expand Up @@ -40,6 +41,7 @@ termux_step_get_source() {
termux_download_src_archive
cd $TERMUX_PKG_TMPDIR
termux_extract_src_archive
mv "$TERMUX_PKG_SRCDIR/android-ndk-r$TERMUX_PKG_VERSION"/* "$TERMUX_PKG_SRCDIR"
else
local lib_path="toolchains/llvm/prebuilt/linux-x86_64/sysroot"
mkdir -p "$TERMUX_PKG_SRCDIR"/"$lib_path"
Expand All @@ -62,8 +64,6 @@ termux_step_post_get_source() {
-e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" \
"$patch" | patch --silent -p1
done
sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
usr/include/android/api-level.h
grep -lrw usr/include/c++/v1 -e '<version>' | xargs -n 1 sed -i 's/<version>/\"version\"/g'
popd
}
Expand Down
5 changes: 3 additions & 2 deletions packages/vulkan-loader-android/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ TERMUX_PKG_MAINTAINER="@termux"
# Version should be equal to TERMUX_NDK_{VERSION_NUM,REVISION} in
# scripts/properties.sh
TERMUX_PKG_VERSION=28c
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r${TERMUX_PKG_VERSION}-linux.zip
TERMUX_PKG_SHA256=59c2f6dc96743b5daf5d1626684640b20a6bd2b1d85b13156b90333741bad5cc
TERMUX_PKG_SHA256=dfb20d396df28ca02a8c708314b814a4d961dc9074f9a161932746f815aa552f
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_BUILD_IN_SRC=true
Expand All @@ -26,6 +26,7 @@ termux_step_get_source() {
termux_download_src_archive
cd $TERMUX_PKG_TMPDIR
termux_extract_src_archive
mv "$TERMUX_PKG_SRCDIR/android-ndk-r$TERMUX_PKG_VERSION"/* "$TERMUX_PKG_SRCDIR"
else
local lib_path="toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr"
mkdir -p "$TERMUX_PKG_SRCDIR"/"$lib_path"
Expand Down
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 @@ -7,10 +7,10 @@ termux_step_setup_toolchain() {
# toolchain setup to ensure that everyone gets an updated
# toolchain
if [ "${TERMUX_NDK_VERSION}" = "28c" ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v1"
TERMUX_STANDALONE_TOOLCHAIN+="-v2"
termux_setup_toolchain_28c
elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v8"
TERMUX_STANDALONE_TOOLCHAIN+="-v9"
termux_setup_toolchain_23c
else
termux_error_exit "We do not have a setup_toolchain function for NDK version $TERMUX_NDK_VERSION"
Expand Down
3 changes: 0 additions & 3 deletions scripts/build/toolchain/termux_setup_toolchain_23c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,6 @@ termux_setup_toolchain_23c() {
rm -Rf usr/include/vulkan
rm -Rf usr/include/{EGL,GLES{,2,3}}

sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
usr/include/android/api-level.h

$TERMUX_ELF_CLEANER --api-level=$TERMUX_PKG_API_LEVEL usr/lib/*/*/*.so | { [[ "${CI-}" == "true" ]] && sed -e '1i\::group::Applying `termux-elf-cleaner`' -e '$a\::endgroup::' || cat; }
for dir in usr/lib/*; do
# This seem to be needed when building rust
Expand Down
3 changes: 0 additions & 3 deletions scripts/build/toolchain/termux_setup_toolchain_28c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,6 @@ termux_setup_toolchain_28c() {
rm -Rf usr/include/vulkan
rm -Rf usr/include/{EGL,GLES{,2,3}}

sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
usr/include/android/api-level.h

$TERMUX_ELF_CLEANER --api-level=$TERMUX_PKG_API_LEVEL usr/lib/*/*/*.so | { [[ "${CI-}" == "true" ]] && sed -e '1i\::group::Applying `termux-elf-cleaner`' -e '$a\::endgroup::' || cat; }
for dir in usr/lib/*; do
# This seem to be needed when building rust
Expand Down