Commit Graph

57 Commits

Author SHA1 Message Date
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
b0ac763d13 native-code: Remove foo_core groups, now only 'core' and 'writer' are used.
Also remove extended_core group. If something from there will be
needed, we will add it another way.
Currently only android/experimental/desktop/Makefile and
ios/CustomTarget_TiledLibreOffice_app.mk are known to do something.

Change-Id: I99936075e35ce98d684581838c0a19dccd83f942
2014-03-06 15:48:26 +01:00
13964ddb61 sc/qa/unit/data/xls/border.xls was removed
..in commit a96b6f4708d587ddddd93101e51e52dec4e87b7e

Change-Id: I94ea246df8fabee9b0bda579be7698c964958e16
2014-01-18 17:04:26 +01:00
4be366de58 native code generator: Do not use single_component_map anymore.
Put cui and spl into extended_code and ignore the rest.

Also change DocumentLoader and LibreOffice4Android to use only
extended_core and writer as all the ios apps do, without knowing what is
really needed there.

Change-Id: Ic6a256ea47cc96132c0e7658d6ef2838b295ca71
2014-01-02 14:40:07 +01:00
3f47635b86 Improve native-code generator for (not only) Android.
Group logic from include/osl/detail/component-mapping.h has been
duplicated here for now.
The plan is to reuse this for iOS too if possible.

We don't need component-declarations.h now, which is good because
the list of implementation constructors is going to grow a lot over time.
Also, something needs to be done to avoid component-defines.h.

--constructor parameter was removed because it was not used
and also does not make sense.

__attribute__ ((visibility("default"))) is removed too.

Change-Id: I5e3f988800303d31e1d78220cbd25339bcbc482a
2013-12-23 21:10:35 +01:00
a17c0950c0 Add tool to generate native-code.cxx for Android.
Should be extended to be helpfull for iOS too.

Change-Id: I862731b6386d5f9cbb508e0c138f45fbe1cb3f46
2013-12-20 13:00:24 +01:00
555168bd6b android: fix/remove last uses of $(OUTDIR) here
Change-Id: Iba4db538fea3ab494af737c91f5fd754de0c044c
2013-10-26 08:46:23 +02:00
6db1f5f4c6 Fix fallout from 30fc3d6cff15ceabea6e1f9c4683cd383c322d72
Change-Id: If97dc13e63986a7c9534f46673cfa8541893269a
2013-10-25 14:21:39 +03:00
01a13519e2 Fix bit-rot
Change-Id: Iae6aa3c1326456dde7261f471ba7d963058f20a7
2013-10-25 10:50:54 +03:00
e30a34f7d7 Fix up Android app makefiles
Change-Id: I885c2bf3dd04b18850d983ab34199074bd41c175
2013-10-03 10:13:39 +03:00
ca99561170 More files are no longer in OUTDIR, only in INSTDIR
Change-Id: Ide6654cbc378621a41a4a207978a4f42bc44d3e3
2013-09-11 11:25:51 +03:00
5a15474709 Adapt to changes in type rdb file locations and names
The old bin/ure/types.rdb was just a duplicate of bin/udkapi.rdb. There is no
bin/types.rdb any more either. We have just udkapi.rdb, offapi.rdb and
oovbaapi.rdb now.

Change-Id: Idd0911f1d4d48f172af159b852918d429f17cc92
2013-04-24 12:45:47 +03:00
1c0e3ea7a0 fix android build
Change-Id: I97903559e1f6ef48476a74a674c0832d9cb44640
2013-04-14 15:00:05 +02:00
f204dc1f8f Get soffice.cfg from its new location for Android, too
Change-Id: I2d65b51ec9a223994d39dc9433d1290b44422e1d
2013-04-11 13:44:14 +03:00
de8d12acf1 Use proper version numbers
Change-Id: Ib0284c3fe63636e42b2e72ab76b02a8197c837e0
2013-03-27 14:36:27 +02:00
bd36b992cf Support an ad-hoc (non-gbuild) Makefile workflow for the Android apps
For now, we want to keep being able to just say for instance "make run" in the
android app directories.

Change-Id: I1898d5466c0df6007fa32b202888bed644fa9489
2013-03-03 01:14:15 +02:00
b89ea45e5b fix android build in separate dir
Change-Id: Id7cf80e1da87a56dee645dc01e64dedc4a8586ab
2013-03-01 18:50:02 -05: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
f6991262cb UNO_TYPES and UNO_MORE_TYPES must contain file: URLs, not pathnames
Apparently it (by accident?) used to work to use pathnames.

Change-Id: Icebda427cef645ed53594e179c211d2a9d020583
2013-02-21 11:55:34 +02:00
68d7b72fcc android: share more of the Makefile / build logic 2013-02-15 10:52:38 +00:00
26c142ca5f Kill the ancient StarOffice "patch" concept
For Windows, superseded by Windows Installer patching (i.e., creating
.msp files), which is something completely different. (And quite hard
to get working... but still a saner approach, I think.)

For Linux, many distros use delta RPMs or similar, so no home-grown
LO-specific patching mechanism is needed.

Remove the -patch and -patchinc command-line options to
make_installer.pl and all code that was invoked only when using those.

Remove the PATCH and PATCH_ONLY flags in scp2.

Remove the patchmsi.dll Windows Installer custom action.

Change-Id: I09e949e601a969f88eff60067faa2352f4f89537
Reviewed-on: https://gerrit.libreoffice.org/1605
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-10 09:32:36 +00:00
4427bb0c58 The "ProductSource" (MWS name) makes no sense any more 2013-01-06 15:30:04 +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
09fa15193e Simplify: Drop URE_MORE_TYPES and URE_MORE_SERVICES
Change-Id: Idf6b9763051b4ca2bb5c5c5e073cdae7abaf9df4
2012-11-22 14:41:46 +02:00
129831703f Add an $APP_DATA_DIR predefiend thingie in bootstrap ("rc") files for Android
It expands to what lo_get_app_data_dir() returns, i.e. the activity's
getApplicationInfo().dataDir.

Use it in the LibreOffice4Android app's rc files instead of a
hardcoded (possibly device- and/or OS version dependent) path.

Change-Id: I8145f2c86eeded39232fb251a79fa64f31f77f55
2012-11-22 14:06:06 +02:00
83833aa79c Don't bother with -Wl,--stats, I'm not loooking at them anyway
Change-Id: I1bbe00e42d6d36c9dd86f576b5cc8998e99819b8
2012-11-21 23:00:35 +02:00
4cf30c6c2a Save more space: compress the .rdb files in the .apk
This means they will have to be uncompressed and copied into actual
files when the app runs for the first time, but that is a small price
to pay for reducing the .apk size with over ten megabytes.

Change-Id: I5bcf3c228197519edd1ca8cbd804b5f027d7699d
2012-11-21 20:01:40 +02:00
0f834124b1 udkapi.rdb could never be used anyway as it is not mentioned in any rc file?
Change-Id: I5897f3d7e8d3d16481c644ee688bcf001d1b7b8c
2012-11-21 16:19:04 +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
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
62b4827f23 Use --gc-sections
Change-Id: I6694f1820dc8c2cdae2522357932ab0065754a75
2012-11-08 15:29:14 +02:00
8d32dc82e6 Produce a linker map
Change-Id: Iff4f7be61310884dea1c29f6fe931dd35cadc552
2012-11-08 15:28:59 +02:00
5476c14de5 Adapt to disable-dynloading style
No need to load any native libraries here any more.

For now, using the same native-code.cxx as over in ../DocumentLoader
works. In other words, we end up with the same code in
liblo-native-code.so. This will obviously change if/when the UNO APIs
that are called start to differ.

Change-Id: Ia47ce833c5a290a93986005f92e981c89f63bf71
2012-10-11 10:07:11 +03:00
f17665bc40 Fix misleading macro name
Change-Id: I6ef47a04c6628723a433bbb625b0934979bd6725
2012-09-04 14:01:38 +03:00
dc8f9877d1 libmerged: another small component libraries for android
Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad
2012-09-01 21:06:12 +02:00
0d6e3a01a5 Add offapi.rdb and oovbaapi.rdb
Change-Id: I58809d549dc4da2f709397d0d6a2b307d75d8885
2012-08-31 14:16:44 +03:00
3f750f8e7b merge more, mostly small libraries for android
Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0
2012-08-25 12:45:36 +02:00
4d7b955705 libmerged: add more libraries
Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
2012-08-25 12:45:35 +02:00
a1aed54fee Build basebmp as a static library for Android
Reduces shared library count by one... This is tedious.

Change-Id: I3bdc0a5c4ee4cabf9bbcedc469ca6e94d0103d6b
2012-08-23 22:26:01 +03:00
c02e838ec2 Factor out the Android APP_ABI sanely instead of copy-paste galore
Change-Id: I66e97d73c410ac6f2e481ba9b2b22183f57438bd
2012-08-23 12:28:59 +03:00
4967a9d8f9 libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
2012-08-20 11:22:22 +02:00
318590b290 android: recover from un-thumb-nail-able documents without crashing 2012-08-14 10:29:35 +01:00
5f9774ed5f merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
2012-08-13 01:48:57 +02:00
b57899ae39 Mkdir before copying
Change-Id: I8e1a3c62bee096252acb04d7be100caaac25a87c
2012-08-09 21:42:40 +03:00
dfa5adcbc2 Make sure the v4 support library used by abs-lib is found
Change-Id: I425a8f0bea9d455b1ffd7ed4374bcde133e9a38c
2012-08-08 12:40:27 +03:00
c78ad3efa8 Bin incorect phrase in comment
Change-Id: I49e75db020064e000d83c1689b548bfff95014df
2012-08-08 12:40:26 +03:00
9dd8fac980 Also set up the local.properties of abs-lib
Change-Id: Icf71e912687d182b0e38efd00626f86df39b1311
2012-08-08 11:43:52 +03:00
f1d1986a97 android: linguistic should cope with a missing extension manager 2012-08-06 10:33:47 +01:00
5f09718dba android: fewer exceptions, and more debug output on null renderables
cleanup some library mentions
2012-08-06 10:33:47 +01:00