Update properties.sh, and ndk-patches for r22

ndk-patches/paths.h.patch

@@ -1,5 +1,5 @@
---- ./usr/include/paths.h.orig	2020-07-10 21:50:03.778299300 +0000
-+++ ./usr/include/paths.h	2020-07-10 21:51:03.127602196 +0000
+--- ./usr/include/paths.h.orig	2020-12-22 09:27:31.845927581 +0100
++++ ./usr/include/paths.h	2020-12-22 09:32:04.380699708 +0100
 @@ -40,14 +40,14 @@
  
  #ifndef _PATH_BSHELL
@@ -12,7 +12,7 @@
  #define _PATH_CONSOLE "/dev/console"
  
  /** Default shell search path. */
--#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
+-#define _PATH_DEFPATH "/product/bin:/apex/com.android.runtime/bin:/apex/com.android.art/bin:/system_ext/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin"
 +#define _PATH_DEFPATH "@TERMUX_PREFIX@/bin"
  
  /** Path to the directory containing device files. */

ndk-patches/stdio.h.patch

@@ -1,22 +1,22 @@
-diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h
---- ./usr.old/include/stdio.h	2019-05-22 12:49:28.000000000 +0300
-+++ ./usr/include/stdio.h	2019-12-13 21:50:02.765565736 +0200
-@@ -44,11 +44,12 @@
+--- ./usr/include/stdio.h.orig	2020-12-22 09:34:14.031384141 +0100
++++ ./usr/include/stdio.h	2020-12-22 09:36:00.408612387 +0100
+@@ -44,11 +44,13 @@
  #include <stdarg.h>
  #include <stddef.h>
  
 +#include <string.h>            /* For strcpy(3) used by ctermid() */
 +#include <asm/fcntl.h>         /* For O_RDWR and other O_* constants */
++
 +
  #include <bits/seek_constants.h>
  
--#if __ANDROID_API__ < __ANDROID_API_N__
+-#if __ANDROID_API__ < 24
  #include <bits/struct_file.h>
 -#endif
  
  __BEGIN_DECLS
  
-@@ -165,7 +166,7 @@
+@@ -165,7 +167,7 @@
      __printflike(2, 0) __warnattr_strict("vsprintf is often misused; please use vsnprintf");
  char* tmpnam(char* __s)
      __warnattr("tempnam is unsafe, use mkstemp or tmpfile instead");
@@ -25,7 +25,7 @@ diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h
  char* tempnam(const char* __dir, const char* __prefix)
      __warnattr("tempnam is unsafe, use mkstemp or tmpfile instead");
  
-@@ -241,8 +242,6 @@
+@@ -289,8 +291,6 @@
  FILE* freopen64(const char* __path, const char* __mode, FILE* __fp) __INTRODUCED_IN(24);
  #endif /* __ANDROID_API__ >= 24 */
  
@@ -34,7 +34,7 @@ diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h
  #if __ANDROID_API__ >= 24
  FILE* tmpfile64(void) __INTRODUCED_IN(24);
  #endif /* __ANDROID_API__ >= 24 */
-@@ -256,10 +255,15 @@
+@@ -304,10 +304,15 @@
  
  #define L_ctermid 1024 /* size for ctermid() */
  
@@ -53,7 +53,7 @@ diff -uNr ./usr.old/include/stdio.h ./usr/include/stdio.h
  
  FILE* fdopen(int __fd, const char* __mode);
  int fileno(FILE* __fp);
-@@ -328,6 +332,30 @@
+@@ -376,6 +381,30 @@
  #include <bits/fortify/stdio.h>
  #endif
  

ndk-patches/stdlib.h.patch

@@ -1,6 +1,5 @@
-diff -uNr sysroot.orig/usr/include/stdlib.h sysroot/usr/include/stdlib.h
---- sysroot.orig/usr/include/stdlib.h	2019-02-12 16:12:24.000000000 +0000
-+++ sysroot/usr/include/stdlib.h	2019-03-20 13:23:48.870108924 +0000
+--- ./usr/include/stdlib.h.orig	2020-12-22 09:37:22.122377110 +0100
++++ ./usr/include/stdlib.h	2020-12-22 09:38:22.159360733 +0100
 @@ -33,6 +33,7 @@
  #include <bits/wait.h>
  #include <malloc.h>
@@ -9,10 +8,10 @@ diff -uNr sysroot.orig/usr/include/stdlib.h sysroot/usr/include/stdlib.h
  #include <sys/cdefs.h>
  #include <xlocale.h>
  
-@@ -211,8 +212,7 @@
+@@ -224,8 +225,7 @@
  size_t wcstombs(char* __dst, const wchar_t* __src, size_t __n);
  
- #if __ANDROID_API__ >= __ANDROID_API_L__
+ #if __ANDROID_API__ >= 21
 -size_t __ctype_get_mb_cur_max(void) __INTRODUCED_IN(21);
 -#define MB_CUR_MAX __ctype_get_mb_cur_max()
 +#define MB_CUR_MAX 4

scripts/properties.sh

@@ -1,6 +1,6 @@
 TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3
-TERMUX_NDK_VERSION_NUM=21
-TERMUX_NDK_REVISION="d"
+TERMUX_NDK_VERSION_NUM=22
+TERMUX_NDK_REVISION=""
 TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
 
 if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then

scripts/setup-android-sdk.sh

@@ -7,7 +7,7 @@ set -e -u
 ANDROID_SDK_FILE=sdk-tools-linux-4333796.zip
 ANDROID_SDK_SHA256=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
 ANDROID_NDK_FILE=android-ndk-r${TERMUX_NDK_VERSION}-Linux-x86_64.zip
-ANDROID_NDK_SHA256=dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd
+ANDROID_NDK_SHA256=d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718
 if [ ! -d $ANDROID_HOME ]; then
 	mkdir -p $ANDROID_HOME
 	cd $ANDROID_HOME/..