From 3d0e516c64002a0dc588f722594947e8197818db Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 25 Mar 2019 17:51:46 +0200 Subject: [PATCH] termux_step_setup_toolchain.sh: simplify unneeded headers removal --- scripts/build/termux_step_setup_toolchain.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh index fbbfb6e5b..a47e9cbd5 100644 --- a/scripts/build/termux_step_setup_toolchain.sh +++ b/scripts/build/termux_step_setup_toolchain.sh @@ -133,14 +133,12 @@ termux_step_setup_toolchain() { # iconv.h: Header for iconv, implemented in libandroid-support. cp "$TERMUX_SCRIPTDIR"/ndk-patches/{ifaddrs.h,libintl.h,langinfo.h,iconv.h} usr/include + # Remove because it is provided by libcap-dev. # Remove from the NDK in favour of that from the libandroid-shmem. # Remove as it doesn't work for non-root. # Remove as we currently provide it from libandroid-glob. # Remove as it's only for future (later than android-27). - rm usr/include/sys/{shm.h,sem.h} usr/include/{glob.h,spawn.h} - - # Remove sys/capability.h provided by libcap-dev. - rm usr/include/sys/capability.h + rm usr/include/sys/{capability.h,shm.h,sem.h} usr/include/{glob.h,spawn.h} sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \ usr/include/android/api-level.h