Commit a6a9b05d authored by Alexandre Julliard's avatar Alexandre Julliard

libwine: No longer look for libraries in the dll path on Android.

parent 8478cece
...@@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize ...@@ -1014,23 +1014,6 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
ret = dlopen( path, flag | RTLD_FIRST ); ret = dlopen( path, flag | RTLD_FIRST );
} }
else 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 #endif
ret = dlopen( filename, flag | RTLD_FIRST ); ret = dlopen( filename, flag | RTLD_FIRST );
s = dlerror(); s = dlerror();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment