From a6a9b05deeab21f24263de32a17b83a17c1403dc Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 24 Jul 2014 09:25:15 +0200 Subject: [PATCH] libwine: No longer look for libraries in the dll path on Android. --- libs/wine/loader.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index c2290dfe4f3..3591ede243e 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ret = dlopen( path, flag | RTLD_FIRST ); } else -#elif defined(__ANDROID__) - if (!strchr( filename, '/' ) && nb_dll_paths) - { - unsigned int i; - char *buffer = malloc( dll_path_maxlen + strlen(filename) + 2 ); - - buffer[dll_path_maxlen] = '/'; - strcpy( buffer + dll_path_maxlen + 1, filename ); - for (i = 0; i < nb_dll_paths; i++) - { - char *path = prepend( buffer + dll_path_maxlen, dll_paths[i], strlen(dll_paths[i]) ); - ret = dlopen( path, flag | RTLD_FIRST ); - if (ret) break; - } - free( buffer ); - if (ret) return ret; - } #endif ret = dlopen( filename, flag | RTLD_FIRST ); s = dlerror(); -- 2.11.4.GIT