From 5510127e89d6971a219ce3664e4631d6c6dda2b1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 30 Nov 2011 21:39:18 +0200 Subject: Android code refactorig and hacking Sorry for the large unstructured commit. But hey, the Android code is experimental so far. Extract the native lo-bootstrap code into a fairly normal library built in sal. (Previously it was the JNI part of the "Bootstrap" app.) Just linkink normally to liblo-bootstrap from C++ code that uses it works fine, no need to do a dlsym lookup. Bootstrap is still a subclass of NativeActivity and can thus still be used as an "app" (to start unit tests, or whatever), but can also be used from some other app's Java code to just get access to the lo-bootstrap native methods. Introduce a new top-level "module", android, for Bootstrap and the experiments with DocumentLoader. Note that the experimental DocumentLoader app still crashes. It can't create the com.sun.star.frame.Desktop instance. I spent lots of time debugging in the painfully inadequate ndk-gdb. (Even the newer gdb build from the "mingw-and-ndk" project is quite crappy in many ways.) I should really experiment with corresponding code on a normal platform first before even trying on Android. Basically, I think that if I just can get the concept of Java code that instantiates and uses LO components *in-process* working on a normal desktop platform, it should work on Android, too. --- sal/util/makefile.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sal/util') diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 981f3cbbe632..d81780a9bf79 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -113,6 +113,10 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract SHL1STDLIBS+=-framework CoreFoundation -framework Carbon .ENDIF +.IF "$(OS)" == "ANDROID" +SHL1STDLIBS+=-llo-bootstrap +.ENDIF + SHL1LIBS+=$(SLB)$/$(TARGET).lib .IF "$(linkinc)" != "" -- cgit