Skip to content

Commit 0b0f290

Browse files
committed
scripts(ndk-patches/28c): use the new __BIONIC_AVAILABILITY_GUARD instead of the older and mostly removed __ANDROID_API__
1 parent 7593579 commit 0b0f290

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

ndk-patches/28c/fcntl.h.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ diff -u -r /home/builder/lib/android-ndk-r28b/toolchains/llvm/prebuilt/linux-x86
55
/** Flag for splice(). */
66
#define SPLICE_F_GIFT 8
77

8-
+#if __ANDROID_API__ >= 26
8+
+#if __BIONIC_AVAILABILITY_GUARD(26)
99
/** Flag for sync_file_range(). */
1010
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
1111
/** Flag for sync_file_range(). */

ndk-patches/28c/time.h.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
__BEGIN_DECLS
66

7-
+#if __ANDROID_API__ >= 35
7+
+#if __BIONIC_AVAILABILITY_GUARD(35)
88
/* If we just use void* in the typedef, the compiler exposes that in error messages. */
99
struct __timezone_t;
1010

scripts/build/termux_step_setup_toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ termux_step_setup_toolchain() {
77
# toolchain setup to ensure that everyone gets an updated
88
# toolchain
99
if [ "${TERMUX_NDK_VERSION}" = "28c" ]; then
10-
TERMUX_STANDALONE_TOOLCHAIN+="-v1"
10+
TERMUX_STANDALONE_TOOLCHAIN+="-v2"
1111
termux_setup_toolchain_28c
1212
elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
1313
TERMUX_STANDALONE_TOOLCHAIN+="-v8"

0 commit comments

Comments
 (0)