diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-30 21:39:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-30 21:52:52 +0200 |
| commit | 5510127e89d6971a219ce3664e4631d6c6dda2b1 (patch) | |
| tree | 7e2d7d06892e086700d5b6bddc8a3ec99c476f6b /sal/prj | |
| parent | a7fe1a0a088b2d3d68e3fc4b0d3e8d5a34f3e203 (diff) | |
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.
Diffstat (limited to 'sal/prj')
| -rw-r--r-- | sal/prj/build.lst | 3 | ||||
| -rw-r--r-- | sal/prj/d.lst | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sal/prj/build.lst b/sal/prj/build.lst index 47b8f58ecac9..f7f16ad12796 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -3,13 +3,14 @@ sa sal usr1 - all sa_mkout NULL sa sal\inc nmake - all sa_inc NULL sa sal\typesconfig nmake - all sa_tc sa_inc NULL sa sal\cpprt nmake - u sa_cpprt sa_util sa_inc NULL +sa sal\android nmake - u sa_android NULL sa sal\rtl\source nmake - all sa_rtl sa_tc.u sa_inc NULL sa sal\textenc nmake - all sa_textenc sa_tc.u sa_inc NULL sa sal\systools\win32\uwinapi nmake - n sa_uwinapi sa_inc NULL sa sal\systools\win32\onlineupdate nmake - n sa_onlineupdate sa_uwinapi.n sa_inc NULL sa sal\osl\w32 nmake - n sa_osln sa_inc NULL sa sal\qa nmake - all sa_qa sa_util NULL -sa sal\osl\unx nmake - u sa_oslu sa_tc.u sa_inc NULL +sa sal\osl\unx nmake - u sa_oslu sa_android.u sa_tc.u sa_inc NULL sa sal\osl\all nmake - all sa_oslall sa_tc.u sa_inc NULL sa sal\util nmake - all sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_onlineupdate.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL sa sal\util\sal_textenc nmake - all sa_util_saltextenc sa_util NULL diff --git a/sal/prj/d.lst b/sal/prj/d.lst index c7f93ed06309..1d73422d2fae 100644 --- a/sal/prj/d.lst +++ b/sal/prj/d.lst @@ -31,6 +31,8 @@ symlink: %_DEST%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl ..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\lib\liblo-bootstrap.so %_DEST%\lib\liblo-bootstrap.so + ..\%__SRC%\slb\sal.lib %_DEST%\lib\xsal.lib ..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll |