From c9d9116d17fe522f491289d99774b0c284387d58 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 11 Jul 2020 00:24:56 +0300 Subject: [PATCH] ndk-patches: fix _PATH_DEFPATH --- ndk-patches/paths.h.patch | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ndk-patches/paths.h.patch b/ndk-patches/paths.h.patch index 4424d18f3..aa41fdd65 100644 --- a/ndk-patches/paths.h.patch +++ b/ndk-patches/paths.h.patch @@ -1,6 +1,6 @@ ---- ./usr/include/paths.h.orig 2020-07-09 16:14:26.230567649 +0000 -+++ ./usr/include/paths.h 2020-07-09 16:15:16.387109516 +0000 -@@ -40,7 +40,7 @@ +--- ./usr/include/paths.h.orig 2020-07-10 21:21:20.717104129 +0000 ++++ ./usr/include/paths.h 2020-07-10 21:24:28.337980566 +0000 +@@ -40,14 +40,14 @@ #ifndef _PATH_BSHELL /** Path to the default system shell. Historically the 'B' was to specify the Bourne shell. */ @@ -9,10 +9,19 @@ #endif /** Path to the system console. */ -@@ -63,3 +63,8 @@ + #define _PATH_CONSOLE "/dev/console" + + /** Default shell search path. */ +-#define _PATH_DEFPATH "/sbin:/system/sbin:/product/bin:/apex/com.android.runtime/bin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin" ++#define _PATH_DEFPATH "@TERMUX_PREFIX@/bin" + + /** Path to the directory containing device files. */ + #define _PATH_DEV "/dev/" +@@ -63,3 +63,9 @@ /** Path to the calling process' tty. */ #define _PATH_TTY "/dev/tty" ++ +#define _PATH_STDPATH _PATH_DEFPATH +#define _PATH_TMP "@TERMUX_PREFIX@/tmp/" +#define _PATH_VARDB "@TERMUX_PREFIX@/var/db/"