diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 23:02:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 23:03:57 +0200 |
| commit | cecc926070ee3d2ad6296fc5e0cfcde8642bb140 (patch) | |
| tree | 50ac14acc645af18f7ee9cb6907f127a99de5185 /sal/osl | |
| parent | 679628f248a94d54e78c8531d13e65f3ae221876 (diff) | |
Clean up remains of NativeActivity-based Android app support
We haven't been able to build NativeActivity-based apps (like the
android/qa/sc and anroid/qa/desktop thingies) since we switched to
DISABLE_DYNLOADING and a single DSO liblo-native-code.so anyway.
No lo_main() any more. <sal/main.h> should not be included ever when
compiling for Android of iOS now.
Lots of stuff binned from vcl's androidinst.cxx, in the (vain?) hope
that it will reduce the amount of never invoked GUI code that gets
linked in.
Change-Id: I25f584864c40110774c728a23151e089620442d9
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 4a10af514557..723d10bcd436 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -104,26 +104,10 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( { oslProcessError result = osl_Process_E_NotFound; -#if defined(ANDROID) && !defined(DISABLE_DYNLOADING) - /* On Android we in theory want the address of the "lo_main()" - * function, as that is what corresponds to "main()" in - * LibreOffice programs on normal desktop OSes. - * - * But that is true only for apps with a "native activity", using - * <sal/main.h> and the org.libreoffice.android.Bootstrap - * mechanism. For more normal (?) Android apps that just use - * LibreOffice libraries (components) where the main program is in - * Java, that just use LibreOffice libraries, there is no - * lo_main(). (Note that we don't know for sure yet how - * complicated it might be to write such Android apps...) - * - * Maybe best to just pick some function in liblo-bootstrap.so - * which also such Java apps *must* load as the very first - * LibreOffice native library. We store all LibreOffice native - * shared libraries an app uses in the same folder anyway, so it - * doesn't really matter. - */ - void * addr = (void *) &lo_dlopen; +#ifdef ANDROID + /* Now with just a single DSO, this one from lo-bootstrap.c is as good as + * any */ + void * addr = dlsym (RTLD_DEFAULT, "JNI_OnLoad"); #else /* Determine address of "main()" function. */ void * addr = dlsym (RTLD_DEFAULT, "main"); |