From d3dd6717598d11e9c66a09331290eef61da92f4b Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 11 Oct 2019 11:50:21 +0300 Subject: [PATCH] engine: android: quick hack to load libraries on aarch64 until we don't symlinking lib folder --- engine/platform/android/lib_android.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/engine/platform/android/lib_android.c b/engine/platform/android/lib_android.c index d7c8255b..68a7673e 100644 --- a/engine/platform/android/lib_android.c +++ b/engine/platform/android/lib_android.c @@ -40,9 +40,19 @@ void *ANDROID_LoadLibrary( const char *dllname ) } // HACKHACK: keep old behaviour for compability - pHandle = dlopen( dllname, RTLD_LAZY ); - if( pHandle ) - return pHandle; + if( Q_strstr( dllname, "." OS_LIB_EXT )) + { + pHandle = dlopen( dllname, RTLD_LAZY ); + if( pHandle ) + return pHandle; + } + else + { + Q_snprintf( path, MAX_SYSPATH, "lib%s"POSTFIX"."OS_LIB_EXT, dllname ); + pHandle = dlopen( path, RTLD_LAZY ); + if( pHandle ) + return pHandle; + } COM_PushLibraryError( dlerror() );