Commit Graph

64 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
44db691206 android: get the desktop demo building again. 2013-02-15 11:41:04 +00: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
fe3303b3dc Similar changes as in ../LibreOffice4Android
Change-Id: I6a0969a2004c52f117d6b250e3af42904bf16a0a
2012-11-22 12:44:26 +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
82bba1a2b3 Drop confusing comment
Change-Id: Ic702abecf1bd21893bd5d4dee532d2e342985e6e
2012-10-11 10:07:12 +03:00
3a5d6a9ac3 Just use the wildcard function to list all the libs
It doesn't seem to be any slower. (Note that we are *not* using
-Wl,--whole-archive around these libs so it won't link in them in
total, but only what's needed.)

Change-Id: I2cc090562fc910d3375c6293f1f4358c68a6f9f3
2012-10-11 10:07:11 +03:00
96ee8e4dce More libraries
Now the DocumentLoader test app seems to work like it does with all
the separate DSOs, knock on wood. The only "attempting to load unknown
library" message I see in logcat is for libspelllo.a, and I
deliberately don't have a mapping for that. A viewer application
presumably has no use for spell checking. (I do link in the
hyphenation stuff, that affects rendering, and we want the rendering
to match LO on the desktop.)

Change-Id: I1ad9eedf352eb0af1187bdfdc71f8f1754912600
2012-10-11 10:07:10 +03:00
6848bcf6e4 More libs
Change-Id: I7921ac41a31f545a74ec2981dda9c30f40d4b4d9
2012-10-11 10:07:10 +03:00
5b195fbcf7 Even more libs
Change-Id: I055b3d1a3105475883283c32a46141c38ed350fa
2012-10-11 10:07:09 +03:00
89372ae703 More libs
Change-Id: I4f717cfdf8e13044931e6820cc9fe6f74fc8aa7f
2012-10-11 10:07:08 +03:00
c11a906a67 More libs
Change-Id: I83214fffadf68c6d92e129fd8f89f671fd9bc1c2
2012-10-11 10:07:07 +03:00
925b118a26 More libs
Change-Id: I2ea26d46f22620d567a23412d7780a95e2715af2
2012-10-11 10:07:06 +03:00
602f93da37 Link in more libs
Change-Id: I5e016a061ea4206966757cda2d6681617b45b550
2012-10-11 10:07:06 +03:00
8ab89346ba Add some more components/libraries
Change-Id: I2dba9bceee4c68b551ed8ed9239e93ea9ae93117
2012-10-11 10:07:06 +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
f9e88410cf Drop misleading comment
Change-Id: I90bc8870fcc7919f2b9c224160d7cb2e7ef285e7
2012-09-04 14:01:39 +03:00
dc8f9877d1 libmerged: another small component libraries for android
Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad
2012-09-01 21:06:12 +02: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
07df4c9ed0 fileacc is in merged
Change-Id: If58adf2558c2baac51f91d621b75f2d37f935dfd
2012-08-23 22:26:00 +03:00
811751bbad Don't hardcode jni/Application.mk either
Change-Id: Id8787a04a3b1720490e7d79a254ca11835df242a
2012-08-23 12:37:21 +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
e9f3727313 Don't be shy
Change-Id: I806dcac11667abfd89a3202ed56e6370e18e185d
2012-08-20 17:36:06 +03:00
4967a9d8f9 libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
2012-08-20 11:22:22 +02:00