Alexandre Julliard : ntdll: Don't use the main exe path as bindir on Android.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 99ef6faf769bba812632ac4a18c925dc5e9f4ca1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=99ef6faf769bba812632ac4a1...

Author: Alexandre Julliard 
Date:   Tue Dec  8 12:41:20 2020 +0100

ntdll: Don't use the main exe path as bindir on Android.

The main exe can be the JVM host process.

Signed-off-by: Alexandre Julliard

---

dlls/ntdll/unix/loader.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 72f215eb2d3..7a9e73d9730 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -339,7 +339,7 @@ static void set_config_dir(void)
     }
 }

-static void init_paths( int argc, char *argv[], char *envp[] )
+static void init_paths( char *argv[] )
 {
     Dl_info info;

@@ -350,7 +350,7 @@ static void init_paths( int argc, char *argv[], char *envp[] )

if (!(build_dir = remove_tail( dll_dir, "/dlls/ntdll" )))
     {
-#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
         bin_dir = realpath_dirname( "/proc/self/exe" );
 #elif defined (__FreeBSD__) || defined(__DragonFly__)
         bin_dir = realpath_dirname( "/proc/curproc/file" );
@@ -1757,7 +1757,7 @@ static void check_command_line( int argc, char *argv[] )
  */
 void __wine_main( int argc, char *argv[], char *envp[] )
 {
-    init_paths( argc, argv, envp );
+    init_paths( argv );

if (!getenv( "WINELOADERNOEXEC" ))  /* first time around */
     {