From c2d7bda87f5e0972c007b4d9639793fe67a5c32e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 21 Jul 2016 12:29:08 +0900 Subject: [PATCH] loader: The preloader is not supported on Android, don't try to use it. Signed-off-by: Alexandre Julliard --- loader/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index bb752b5b097..05e0c068a2e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -109,7 +109,14 @@ static void check_command_line( int argc, char *argv[] ) } -#if defined(__linux__) && (defined(__i386__) || defined(__arm__)) +#ifdef __ANDROID__ + +static int pre_exec(void) +{ + return 0; /* no exec needed */ +} + +#elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) #ifdef __i386__ /* separate thread to check for NPTL and TLS features */