Commit Graph

56 Commits

Author SHA1 Message Date
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
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
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
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
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
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
f62324cecd Use the newfangled "include" directory
Change-Id: I3228ad8277d34454affe71b9cbc9ad7f56326ca9
2013-04-24 11:54:56 +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
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
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
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
b9bef032ce COPYSO should not be used with DISABLE_DYNLOADING
Change-Id: I0e04cd8fe35a487b85cd3abd420d24ab2a55821a
2012-10-11 10:07:12 +03:00