Kaydet (Commit) 22501619 authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist

Adapt for DISABLE_DYNLOADING possibility on Android

Change-Id: I7fcea698c3d89c5b84b38a708502bcdf4526a614
üst 0fb18d82
...@@ -96,7 +96,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) { ...@@ -96,7 +96,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) {
#else #else
Dl_info dl_info; Dl_info dl_info;
#ifdef ANDROID #if defined(ANDROID) && !defined(DISABLE_DYNLOADING)
result = lo_dladdr(address, &dl_info); result = lo_dladdr(address, &dl_info);
#else #else
result = dladdr(address, &dl_info); result = dladdr(address, &dl_info);
...@@ -105,7 +105,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) { ...@@ -105,7 +105,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) {
if (result != 0) if (result != 0)
{ {
rtl_string_newFromStr(path, dl_info.dli_fname); rtl_string_newFromStr(path, dl_info.dli_fname);
#ifdef ANDROID #if defined(ANDROID) && !defined(DISABLE_DYNLOADING)
free((void *) dl_info.dli_fname); free((void *) dl_info.dli_fname);
#endif #endif
result = sal_True; result = sal_True;
......
...@@ -113,7 +113,7 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( ...@@ -113,7 +113,7 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
{ {
oslProcessError result = osl_Process_E_NotFound; oslProcessError result = osl_Process_E_NotFound;
#ifdef ANDROID #if defined(ANDROID) && !defined(DISABLE_DYNLOADING)
/* On Android we in theory want the address of the "lo_main()" /* On Android we in theory want the address of the "lo_main()"
* function, as that is what corresponds to "main()" in * function, as that is what corresponds to "main()" in
* LibreOffice programs on normal desktop OSes. * LibreOffice programs on normal desktop OSes.
......
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