mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
356,287 Commits 1 Branch 0 Tags
Commit Graph

96 Commits

Author SHA1 Message Date
Tomaž Vajngerl
b046b687f9 lok bootstrap: nicer function names, clean-up 
+ prevent lokandroid JNI functions to be removed from the library
+ basic use of lok Office / Document in LibreOfficeMainActivity

Change-Id: I7bfe53738cf821b2270ab3e024cc506a7cff42f0
 2014-07-01 09:12:21 +02:00
Tomaž Vajngerl
ca61fdcac9 libreofficekit JNI for Android 
Change-Id: Ia905c20fb4ee9b126d65fd3c8e3c1f54649abe1a
 2014-07-01 09:12:14 +02:00
Jan Holesovsky
d2eeb05da6 android: Correct location and name of sofficerc. 
Without that, URE_BOOTSTRAP does not get set up, and we are unable to
bootstrap.

Change-Id: I7727e2a9dcbb958e006fadf6243e1ca343633f7e
 2014-06-30 14:48:04 +02:00
Jan Holesovsky
f918192ece android: Relink liblo-native-code.so when a library changes. 
This is so that calls like 'make configmgr android' produce an .apk with
updated code changes from configmgr as expected.

Change-Id: I5f576b01269cf3f559a8a6389af298a3758e7309
 2014-06-30 14:48:04 +02:00
Jan Holesovsky
d5d480dcce android: copy-stuff rule is copy'n'pasted around, consolidate it. 
Change-Id: I0a746904fa363f987e96165d8def326eb87dcf8f
 2014-06-30 14:48:03 +02:00
Jan Holesovsky
c72d300ba0 android: Make the extract_files() part of setup / init. 
We need to have the files extracted before we attempt to initialize
LibreOfficeKit (call libreofficekit_hook), otherwise the .rdb's are not there.

Change-Id: Ib49db7e945a709d18a063eb488a27df18fef542b
 2014-06-30 14:48:03 +02:00
Jan Holesovsky
db89e5ff81 android: Make use of LibreOfficeKit. 
Now the LibreOfficeKit is used to actually attempt to bootstrap LibreOffice;
at the moment fails to do that.

Change-Id: I91220dbff783213bf7702e7213a5646859db4581
 2014-06-30 14:48:03 +02:00
Jan Holesovsky
74ab9835f9 android: Introduce LibreOfficeKit.java to bootstrap using LibreOfficeKit. 
Change-Id: I5e1758c15684b06ab6809f62f4da6d5f50c071a9
 2014-06-30 14:48:03 +02:00
Jan Holesovsky
cfd74ae2b9 android: Support for Android SDK Tools 23 + note about their brokeness. 
Change-Id: I6b1636703044f03c5daa4c3ac1630f23c5c3c2e5
 2014-06-30 14:48:01 +02:00
Jan Holesovsky
e3d91e9148 android: Allow verbose output from the ant build. 
Change-Id: I1086a7ab6bc7913c9c9f2492d07915039007e613
 2014-06-30 14:48:01 +02:00
Tor Lillqvist
71e3756778 Need libGLESv2 now then 
Change-Id: I87e91202a6005ad0bec3569b2619a5b191991502
 2014-04-15 08:39:13 +03:00
Tor Lillqvist
c927ceb96c Switch to android-15 here, too 
Change-Id: If7b66e60fcf8af97a69e20af9c77793a163c4c17
 2014-03-28 12:44:57 +02:00
Matúš Kukan
7efbca6642 android: Remove native-code.cxx on make clean. 
Change-Id: Ib287792c754c4b3ee6c8a45749ef9ad7197df84a
 2014-01-22 20:24:54 +01:00
Tor Lillqvist
4175118929 Bin obsolete comment 
Change-Id: I21d233996d21d78f601d427e89c14f668af85bcf
 2013-12-18 19:31:24 +02:00
Tor Lillqvist
52bcb7e80a Fix path to lo-all-static-libs 
Change-Id: I431841a71d6b4dc1f7a50efbf28f827e7e50ca57
 2013-12-05 16:26:05 +02:00
Tor Lillqvist
e6a8768233 Use lo-all-static-libs 
Change-Id: Ifaf7a6f6dd61d27a89feed2f718f7a91e9da7262
 2013-11-22 23:28:49 +02:00
Andrzej J.R. Hunt
f29a2b4288 Add EBOOK_LIBS to android build. 
Change-Id: I19af7ecf0fe746e6c41c95e647141b4c0af0f6d4
Reviewed-on: https://gerrit.libreoffice.org/6673
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
 2013-11-14 19:47:16 +00:00
Tor Lillqvist
354c1a99ea Add FREEHAND_LIBS 
Change-Id: I0230a18aaf5c8c9fe9f55a137cc62cbfc3992d42
 2013-11-01 08:59:09 +02:00
Matúš Kukan
555168bd6b android: fix/remove last uses of $(OUTDIR) here 
Change-Id: Iba4db538fea3ab494af737c91f5fd754de0c044c
 2013-10-26 08:46:23 +02:00
Tor Lillqvist
96c7e0f526 No libs in $(OUTDIR)/lib any more 
Change-Id: If1781415f49f86fea0de5a05a38c878d3924812b
 2013-10-24 23:42:13 +03:00
Michael Stahl
b242cee828 freetype: use libraries from WORKDIR 
Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1
 2013-10-24 13:10:38 +02:00
Michael Stahl
76596b3948 fontconfig: use libraries from WORKDIR 
Change-Id: I4b967187bca35527a3c3d718952ae0a3ae6ebae9
 2013-10-24 13:10:38 +02:00
Michael Stahl
936a1a9daf curl: use libraries from WORKDIR 
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
 2013-10-24 00:24:16 +02:00
Michael Stahl
25f65f26a2 lcms2: use libraries from WORKDIR 
Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
 2013-10-24 00:24:14 +02:00
Michael Stahl
b177b30675 lpsolve: use libraries from WORKDIR 
Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150
 2013-10-24 00:24:13 +02:00
Michael Stahl
2793c546dc redland: use libraries from WORKDIR 
Change-Id: Ief9a38cbef7552e94ce4ad01fa363a29654bdf9e
 2013-10-24 00:24:12 +02:00
Michael Stahl
c1cc1861ea android: try to find ICU libs 
Change-Id: I70d15c10bbe22e5a1030813d531cf98f834911ea
 2013-10-23 20:27:27 +02:00
Tor Lillqvist
763114f8b7 libxml2 and libxslt libs are only in workdir now 
We really should set up this list of all the libraries (even one including
wildcards) in a single place in configury. Now this information is duplicated
in several places. (Such a list is used when linking a single (app-specific)
DSO for an Android app or a single executable for an iOS app.)

Change-Id: Ic77bdd5a4e58686693f4ac3987ba73bca011db3b
 2013-10-23 13:31:58 +03:00
Tor Lillqvist
cd7c0c6adf There is no inc in solver any more 
Change-Id: I83c1001d67a9c3e5c2a6e2ff4c93a97214f24475
 2013-10-23 10:49:21 +03:00
Tor Lillqvist
c95393cbf3 Add dummy implementations of the UI layer callbacks now required 
Change-Id: I2caaac66758863b0f384df13ab30526f21be1e8d
 2013-10-23 10:49:21 +03:00
Tor Lillqvist
a5730bde11 3rd party libs need to be listed more individually now, sigh 
Change-Id: I604f681a43a209cb6951209e01be1bcc26cdc3c9
 2013-09-30 14:25:25 +03:00
Tor Lillqvist
d344d46cd4 I don't think the map file is that useful to generate every time 
Change-Id: I15ba6f0ffc645746be8deb83bc623a340b76bda9
 2013-09-10 10:42:50 +03:00
Tor Lillqvist
653a4b313c Need a no-resource-compress.xml for Android SDK version 22, too 
Can be identical to the one for version 21.

Change-Id: Ic974dd9ed06947e6be1c04598d3a7e715795e202
 2013-06-27 12:08:19 +03:00
Tor Lillqvist
f62324cecd Use the newfangled "include" directory 
Change-Id: I3228ad8277d34454affe71b9cbc9ad7f56326ca9
 2013-04-24 11:54:56 +03:00
Michael Meeks
62badf3828 Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-22 09:37:38 +01:00
Tor Lillqvist
07c1b61933 Small refactoring of the Android "desktop app" code, no functional change 
Move the native methods out to a separate AppSupport class so that they aren't
in our "experimenal" Desktop app's namespace. Don't hardcode the name of that
class in the native code, but have the app register the class to which the
damage callbacks should be done.

Possibly the AppSupport and Bootstrap classes should be combined. Later.

Also, the "android" part of the package name is superfluous; it is
Android-specific code, no information gained by having an "android" part in
the package name.

Change-Id: Iddf55c8034ead7693887ace8438deb002c5eea9f
 2013-04-19 18:50:36 +03:00
Tor Lillqvist
18e035964e Cleanups to the android and ios makefilery 
Also build the "desktop" app from gbuild.

Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063
 2013-03-01 10:55:51 +02:00
Tor Lillqvist
e4bad391fc createWindowFoo is unused 
Change-Id: Ia61efc5d5ee65178fd7d868cb57eed9ba3c0519e
 2013-02-26 23:48:54 +02:00
Tor Lillqvist
388b72742a We are not using NativeActivity, nor do we plan to, IIUC 
Partially revert 52a8744afee2cd589813f0377d93f821fce7aedd, i.e. once again
start to remove stuff related only to using NativeActivity... (Because it is
confusing and misleading to keep it around.) Let's do it in small pieces this
time.

Change-Id: Ifdc52eb0ae32c7c510418611cbf01a857a8bc697
 2013-02-22 22:30:23 +02:00
Tor Lillqvist
8656ff7212 Do strip the .so that will be included in the .apk 
There is no use for non-exported symbols and debugging information in the .so
on the device.

Debugging with ndk-gdb uses the non-stripped copy of the .so located on the
build machine and works fine (as fine as the NDK gdb can work) even if the .so
that is actually running on the device includes no debugging information.

Change-Id: If4e77284a74427261eefac0e167ed42161c773f8
 2013-02-21 22:54:36 +02:00
Michael Meeks
4d25878755 android: finally starting and rendering at least something again. 
Only renders on very-first-start after install (oddly).
We initialize vcl in it's own thread to avoid problems.
Thanks to tml for fixing a linking issue.
Change-Id: I960d11c6098681356fea0634970545aa9af9bacb
 2013-02-21 22:54:36 +02:00
Michael Meeks
52a8744afe Revert "Clean up remains of NativeActivity-based Android app support" 
This reverts commit cecc926070ee3d2ad6296fc5e0cfcde8642bb140.

Conflicts:
	sal/android/lo-bootstrap.c
	sal/inc/osl/detail/android-bootstrap.h
 2013-02-21 22:54:36 +02:00
Michael Meeks
346b64473a android: detect updated sdk and re-generate troublesome ant rules. 
Change-Id: I147439e99892a5794a4bca880c5b3e22e46e1f86
 2013-02-15 20:01:09 +00:00
Michael Meeks
be6597a678 avoid re-linking if nothing changed. 2013-02-15 11:41:03 +00:00
Michael Meeks
68d7b72fcc android: share more of the Makefile / build logic 2013-02-15 10:52:38 +00:00
Tor Lillqvist
29f9c06217 Let's not break "make clean install" 
Change-Id: I1a1694bf4ad463ed18c99c5471c53ca26578dfdb
 2012-11-26 09:40:57 +02:00
Tor Lillqvist
a9747280ef It's an emulator, not simulator 
Change-Id: I01665f9030c9a544a89d3857f96bf3073c706435
 2012-11-26 09:40:56 +02:00
Tor Lillqvist
b60f7e4e1c Add newline 
Change-Id: Iadb52498dc3906df7488fb534fd04336b3e468e5
 2012-11-25 17:50:28 +02:00
Tor Lillqvist
ae6431798e Make the android_version_setup work better 
Change-Id: Ibc8f9df533c1fef3c1e428e62622ac2c56552498
 2012-11-25 17:38:21 +02:00
Michael Meeks
aaaf5126c6 android: adapt the ant clobbering to a given SDK version. 
Another volunteer fell over this, and (I hope) it's easy enough.

Change-Id: I7149d16fd8b7749afeeccef2ebc8f493200f1900
 2012-11-24 16:42:47 +00:00