Commit Graph

124 Commits

Author SHA1 Message Date
8ecf956d79 Remove the ThumbnailGenerator class
The only use of it is commented out. ThumbnailGenerator used the UNO-based
XToolkitExperimental stuff that I want to get rid of. If/when we want
thumbnails, we should use the existing thumbnails from document formats that
have them, or generate them using LOKit.

Also remove stuff from the Bootstrap class that was only used by
ThumbnailGenerator.

Conflicts:
	android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
Reviewed on:
	https://gerrit.libreoffice.org/13503

Change-Id: Ia3a1a7f372a814359c5b496cdb17c35246e34817
2014-12-17 10:53:29 +01:00
83cd0040fa android: remove unneeded logging and comment tile rendering timing
Change-Id: Ia44efb54cbb0a91ea61cef9e7f250b5105c7ff51
2014-12-11 23:10:42 +01:00
515a8cf400 android: use ByteBuffer to send or store pointers in JNI bindings
Using direct ByteBuffer is much nicer option to store or send
pointers between C(++) code and Java via JNI as it handles endiness
and pointer size for us. Using "long" type can have unexpected
results in 32-bit architectures (mostly Android). This was causing
grief especially when Android introduced support for 64-bit
architectures starting with SDK 19.

Change-Id: Ie92d0f913b668e1724e846d70d1820445d9cb086
2014-12-04 23:04:27 +01:00
333a894ba8 android: cleanup LibreOfficeKit initialization in Java
Change-Id: I7688968e92ae4b3d6fef19c4544ae91bdcd8b1b9
2014-12-04 23:04:27 +01:00
4924ae7046 android: improve error messages in DirectBufferAllocator
Change-Id: Iefab77e543606cfad937a79743fb3b9a68a0f2a2
2014-12-04 23:04:26 +01:00
a703b3651b android: add destroy and exit as a separate JNI call
Change-Id: Ia8516da556b3736f34b366e2eb89ad8bbd7bafc1
2014-12-04 23:04:26 +01:00
a813044708 android: VM based implementation of DirectBufferAllocator
DirectBufferAllocator is responsible to allocate buffer. We used
Fennec JNI based allocation (and freeing) because of overallocation
bug in some Android versions. With this the VM based allocator
implementation is added and used by default because of bugs that
happen in newer Android versions (specifically when ART is used
as the Android VM).

Change-Id: I07eb364fd1647b3a09d1568d4fef82398a02dfeb
2014-12-04 23:04:26 +01:00
8938d3b256 Do the configuration pruning only in the DISABLE_UI case
Change-Id: If85c6a86434c0aa32d188a0f128f6b6cd613bbb5
2014-12-04 23:04:25 +01:00
0a1e1d9a1f The configuration pruning with mobile-config.py seems to work now
Change-Id: I1b1891f0d7d7b8aa407e7da346ff5f8e3cbe8657
2014-12-04 23:04:25 +01:00
ebd868076b Add (commented-out) invocation of mobile-config.py
Change-Id: I379601099bda928b9eeeaeb29030bc009e3cbbf2
2014-12-04 23:04:24 +01:00
12491e11f0 android: force create directory assets/gz.unpack/program
It can happen that this directory doesn't exist and the copy
script fails (especially on a clean install). The script has been
modified to force create this directory before trying to copy
stuff into it.

Change-Id: Iedf3caef07e6896405750aea9e8f211b1e80dc3a
2014-12-04 12:23:04 +01:00
885a578b2c LOK Android: don't initialise until TMPDIR is set.
As part of LOK initialisation we now start soffice_main, this
requires TMPDIR access, and will fail if we haven't set TMPDIR
(as by default it attemps to access /tmp which is not allowed on
Android).

Change-Id: I63bd7bce9b52c898c60fda6eea33ee919349a109
2014-12-04 12:23:03 +01:00
814e405481 Fix Android build
Adapt to URE merge. (Not sure whether the app(s) still work, but at least it
now builds.)

Change-Id: I6e85fd8eaebea75c22188f4f36269dbbe55d012a
2014-12-01 20:59:11 +02:00
982f199a98 Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-12-01 15:10:32 +01:00
d90d47e513 version ini-file's ProductMajor/Minor are unused
...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0)
vs. installation sets (ProductMajor=50, ProductMinor=)

Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4
2014-11-26 10:53:12 +01:00
2fc4952bd0 Remove unused URE_LIB_DIR
(which now had a bogus value on Mac OS X anyway)

Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
2014-11-25 14:10:43 +01:00
f33d881198 android: Better default document (when the app starts with no doc to load).
Change-Id: Ie3cc30c29723133d5e320ad3848d13f06d133c78
2014-10-04 17:52:18 +02:00
2a61d1eefa android: package C* fonts as well for interop.
Change-Id: I49c6c4bf0b2ddfb403612ccad90a41e8ae525427
2014-10-04 17:48:17 +02:00
520a4fdfe4 android: better default part name (document type dependent)
Change-Id: I7ea1f1f5c249a4df250bde049cc52b4f392e4d38
2014-10-04 17:42:10 +02:00
d37803223d android: copy notice & license into assets (for apk)
Change-Id: Ic2289d5ca96d06352c853d7803938a12aa204e73
2014-10-04 17:39:28 +02:00
28eec2207c android: disable packaging of un-needed UI files.
Appears to save ~10Mb of apk size.

Change-Id: I7c49da979e2868628bf3cf07937e898d717a5071
2014-09-30 17:07:26 +01:00
688ff90d32 android: force initialize LibreOfficeKit, clean-up
Change-Id: I0c7b7d10b34c0f71bf8500696fdbc0ed38303f0e
2014-09-24 20:43:03 +02:00
b85c779595 android: use JNI direct memory allocator from Fennec
Change-Id: I95a9ab54222150a1f9cde30df820f3cd6915f641
2014-09-24 20:43:01 +02:00
18c052d6d6 LOKit: add "destroy" and "saveAs" to android JNI
Change-Id: I08542b736e49cb9262323e9fe6188b1976d47935
2014-09-22 22:40:07 +02:00
81f1c25927 LOKit android: add support for setPartMode and getPartName
Change-Id: Idd8bd4d4b148e88c7badd06fefb7cfcfc24ec9ea
2014-08-10 23:00:43 +02:00
b7742fd8b8 Add getPart(s) to lokandroid too.
I.e. make lokandroid match
4d15212ef8de89a71387c00bdeb7d9a41409e467
2014-07-13 08:06:58 +02:00
a3ccf3eab5 lok JNI: no "handle" in funcs & don't wrap some native funcs
Change-Id: If783fecd80a0de05e94c76e23572b567d151bb06
2014-07-03 10:51:56 +02:00
c5777b4edd android lok: fix paintTile JNI method
Change-Id: Ife12b8bc49d722ae614b7de253bb2061bea5bb7f
2014-07-02 11:14:17 +02:00
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
ca61fdcac9 libreofficekit JNI for Android
Change-Id: Ia905c20fb4ee9b126d65fd3c8e3c1f54649abe1a
2014-07-01 09:12:14 +02:00
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
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
d5d480dcce android: copy-stuff rule is copy'n'pasted around, consolidate it.
Change-Id: I0a746904fa363f987e96165d8def326eb87dcf8f
2014-06-30 14:48:03 +02:00
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
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
74ab9835f9 android: Introduce LibreOfficeKit.java to bootstrap using LibreOfficeKit.
Change-Id: I5e1758c15684b06ab6809f62f4da6d5f50c071a9
2014-06-30 14:48:03 +02:00
cfd74ae2b9 android: Support for Android SDK Tools 23 + note about their brokeness.
Change-Id: I6b1636703044f03c5daa4c3ac1630f23c5c3c2e5
2014-06-30 14:48:01 +02:00
e3d91e9148 android: Allow verbose output from the ant build.
Change-Id: I1086a7ab6bc7913c9c9f2492d07915039007e613
2014-06-30 14:48:01 +02:00
71e3756778 Need libGLESv2 now then
Change-Id: I87e91202a6005ad0bec3569b2619a5b191991502
2014-04-15 08:39:13 +03:00
c927ceb96c Switch to android-15 here, too
Change-Id: If7b66e60fcf8af97a69e20af9c77793a163c4c17
2014-03-28 12:44:57 +02:00
7efbca6642 android: Remove native-code.cxx on make clean.
Change-Id: Ib287792c754c4b3ee6c8a45749ef9ad7197df84a
2014-01-22 20:24:54 +01:00
4175118929 Bin obsolete comment
Change-Id: I21d233996d21d78f601d427e89c14f668af85bcf
2013-12-18 19:31:24 +02:00
52bcb7e80a Fix path to lo-all-static-libs
Change-Id: I431841a71d6b4dc1f7a50efbf28f827e7e50ca57
2013-12-05 16:26:05 +02:00
e6a8768233 Use lo-all-static-libs
Change-Id: Ifaf7a6f6dd61d27a89feed2f718f7a91e9da7262
2013-11-22 23:28:49 +02:00
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
354c1a99ea Add FREEHAND_LIBS
Change-Id: I0230a18aaf5c8c9fe9f55a137cc62cbfc3992d42
2013-11-01 08:59:09 +02:00
555168bd6b android: fix/remove last uses of $(OUTDIR) here
Change-Id: Iba4db538fea3ab494af737c91f5fd754de0c044c
2013-10-26 08:46:23 +02:00
96c7e0f526 No libs in $(OUTDIR)/lib any more
Change-Id: If1781415f49f86fea0de5a05a38c878d3924812b
2013-10-24 23:42:13 +03:00
b242cee828 freetype: use libraries from WORKDIR
Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1
2013-10-24 13:10:38 +02:00
76596b3948 fontconfig: use libraries from WORKDIR
Change-Id: I4b967187bca35527a3c3d718952ae0a3ae6ebae9
2013-10-24 13:10:38 +02:00