Commit Graph

86 Commits

Author SHA1 Message Date
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
936a1a9daf curl: use libraries from WORKDIR
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
2013-10-24 00:24:16 +02:00
25f65f26a2 lcms2: use libraries from WORKDIR
Change-Id: Ieddc80d510884eeb6f64325f9dfbb34f1d3fb0b5
2013-10-24 00:24:14 +02:00
b177b30675 lpsolve: use libraries from WORKDIR
Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150
2013-10-24 00:24:13 +02:00
2793c546dc redland: use libraries from WORKDIR
Change-Id: Ief9a38cbef7552e94ce4ad01fa363a29654bdf9e
2013-10-24 00:24:12 +02:00
c1cc1861ea android: try to find ICU libs
Change-Id: I70d15c10bbe22e5a1030813d531cf98f834911ea
2013-10-23 20:27:27 +02:00
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
cd7c0c6adf There is no inc in solver any more
Change-Id: I83c1001d67a9c3e5c2a6e2ff4c93a97214f24475
2013-10-23 10:49:21 +03:00
c95393cbf3 Add dummy implementations of the UI layer callbacks now required
Change-Id: I2caaac66758863b0f384df13ab30526f21be1e8d
2013-10-23 10:49:21 +03:00
a5730bde11 3rd party libs need to be listed more individually now, sigh
Change-Id: I604f681a43a209cb6951209e01be1bcc26cdc3c9
2013-09-30 14:25:25 +03:00
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
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
f62324cecd Use the newfangled "include" directory
Change-Id: I3228ad8277d34454affe71b9cbc9ad7f56326ca9
2013-04-24 11:54:56 +03:00
62badf3828 Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-22 09:37:38 +01:00
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
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
e4bad391fc createWindowFoo is unused
Change-Id: Ia61efc5d5ee65178fd7d868cb57eed9ba3c0519e
2013-02-26 23:48:54 +02:00
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
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
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
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
346b64473a android: detect updated sdk and re-generate troublesome ant rules.
Change-Id: I147439e99892a5794a4bca880c5b3e22e46e1f86
2013-02-15 20:01:09 +00:00
be6597a678 avoid re-linking if nothing changed. 2013-02-15 11:41:03 +00:00
68d7b72fcc android: share more of the Makefile / build logic 2013-02-15 10:52:38 +00:00
29f9c06217 Let's not break "make clean install"
Change-Id: I1a1694bf4ad463ed18c99c5471c53ca26578dfdb
2012-11-26 09:40:57 +02:00
a9747280ef It's an emulator, not simulator
Change-Id: I01665f9030c9a544a89d3857f96bf3073c706435
2012-11-26 09:40:56 +02:00
b60f7e4e1c Add newline
Change-Id: Iadb52498dc3906df7488fb534fd04336b3e468e5
2012-11-25 17:50:28 +02:00
ae6431798e Make the android_version_setup work better
Change-Id: Ibc8f9df533c1fef3c1e428e62622ac2c56552498
2012-11-25 17:38:21 +02:00
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
cecc926070 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
2012-11-21 23:03:57 +02:00
ae81246917 We don't need the library search path anymore
As we don't use any dlopen() etc wrappers now with just one single
DSO, we have no use for the library search path either.

Change-Id: Ifaf11c4785a90fe5c7dafb3310bc7933ea31238c
2012-11-21 15:22:27 +02:00
970b53e050 Enable storing some files gzipped in the .apk
We gzip them separately in the Makefile and the gzipped result will be
stored without (further) compression in the .apk.

Use this to store the ttf font files. Shaves off a bit .apk size.

This might seem a bit odd way to do it, why not store these files in
the normal Zip compressed fashion in the .apk? It seems hard to tell
Ant (based on path, not extension) what files to compress and what
not, so we have to keep telling it to not (further) compress any files
at all.

Change-Id: I0d40d8811e6c9df6b28c285845b1db225507f5d4
2012-11-21 15:05:13 +02:00
a0adefdc49 Update to match SDK r21
Change-Id: I7bc54a295c7155a1a173c28f45118a6d2983d0d2
2012-11-20 14:28:27 +02:00
26b8cd2b3e Reduce dynamic symbols and strip all local ones from the Android single .so
Use a version script ("version map") that exports only the Java_* and
JNI_OnLoad symbols that the JNI machinery needs. No non-dynamic
symbols are needed (in the .so that goes into the .apk; the one kept
locally for debugging is not stripped).

Change-Id: Ie874e59c593ec9e5d08ba369612cef1a3ea85fe4
2012-11-16 16:25:17 +02:00
b9bef032ce COPYSO should not be used with DISABLE_DYNLOADING
Change-Id: I0e04cd8fe35a487b85cd3abd420d24ab2a55821a
2012-10-11 10:07:12 +03:00
4b7e701024 Use DISABLE_DYNLOADING on Android
IN this branch these changes are not conditional. Unclear yet whether
this is what we finally will want to use or not. Maybe should make
these changes conditional and do this stuff in master instead?

Change-Id: I379d570a0e00648d295c675fd90eba6594ba3182
2012-10-11 10:07:05 +03:00
e989d16748 dung out no longer needed initUCBHelper methods; thanks to sberg. 2012-09-19 18:41:45 +01:00
c0bc0003ee RTFM for Arrays.copyOfRange()
Change-Id: Ie0d7bd95207aafb269f23974b8e90fa0b50fdb86
2012-09-05 16:12:14 +03:00
f1aca5bf8a Fix infinite loop introduced by accident
Change-Id: I4aee6214123b14f40e01850e1814a4e2d089ec8c
2012-09-04 14:01:39 +03:00