Commit graph

86 commits

Author SHA1 Message Date
Tor Lillqvist
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
Michael Meeks
44db691206 android: get the desktop demo building again. 2013-02-15 11:41:04 +00:00
Michael Meeks
68d7b72fcc android: share more of the Makefile / build logic 2013-02-15 10:52:38 +00:00
Tor Lillqvist
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
Tor Lillqvist
4427bb0c58 The "ProductSource" (MWS name) makes no sense any more 2013-01-06 15:30:04 +02:00
Miklos Vajna
33ab92fe56 android: make this a bit more readable
Change-Id: I765458daa808245ec736a3d184ba64c2dcd3a10b
2012-11-26 09:30:51 +01:00
Miklos Vajna
593e4a11ed android: extract duplicated casts to helper methods
Change-Id: Ib77731839ad9e46626a7a07d4b2c6c7e32d4bba1
2012-11-26 09:30:51 +01:00
Michael Meeks
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
Miklos Vajna
a3b8cfa65c android: clean up no longer needed onSaveInstanceState()
It could not be used to save whole objects, so get rid of it and use
onRetainNonConfigurationInstance() exclusively.

Change-Id: I7cc3951b60a054b5b2488b49791b58707dc8a68b
2012-11-22 15:56:58 +01:00
Tor Lillqvist
fe3303b3dc Similar changes as in ../LibreOffice4Android
Change-Id: I6a0969a2004c52f117d6b250e3af42904bf16a0a
2012-11-22 12:44:26 +02:00
Miklos Vajna
3ef3601f79 android: add 'go to page' menu item
Change-Id: Ie9d04ef9aeef5cacd1c3b8557111ee3a6194ccd4
2012-11-21 17:16:30 +01:00
Miklos Vajna
4460f406a4 android: don't load the document after every rotation
Change-Id: I0af154bc5bc6cc79ab45a85a5a06e4539442ec81
2012-11-20 12:51:00 +01:00
Miklos Vajna
a1d9caffa3 android: move toolkit and dummySmallDevice to bootstrapContext as well
Change-Id: I4b6ce49aa5e6d391e832dc1023e47d694a480948
2012-11-20 12:10:52 +01:00
Miklos Vajna
4c359c22e1 android: don't bootstrap after every rotation in DocumentLoader
It seems that previously onCreate served 3 different purposes:

1) bootstrap UNO machinery
2) load the document
3) create the view

Ideally it should do the first two only if not done already -- as a
first step, this commit extracts 1) and does only once.

Change-Id: I087a6b934c05295263080f571c95ef152e4602cb
2012-11-20 11:02:25 +01:00
Tor Lillqvist
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
Miklos Vajna
677ca1d596 android: remember displayed page during rotation in DocumentLoader
Change-Id: I1948dcc76026e4c906407932aa67371e5e9e8bb6
2012-11-13 14:25:52 +01:00
Miklos Vajna
29719a369d sync android manifest with project properties: sdk version
Note that with having a targetSdk >= 11 and minSdk <= 10, we can enable
hw acceleration without loosing compatibility with 2.x devices.

Also, remove android:configChanges="orientation", as it seems to improve
rotation experience a bit.

Change-Id: Ia3be9bb3b998d604a032eb5c60f9bb0ec71dfc68
2012-11-12 11:27:37 +01:00
Tor Lillqvist
62b4827f23 Use --gc-sections
Change-Id: I6694f1820dc8c2cdae2522357932ab0065754a75
2012-11-08 15:29:14 +02:00
Tor Lillqvist
8d32dc82e6 Produce a linker map
Change-Id: Iff4f7be61310884dea1c29f6fe931dd35cadc552
2012-11-08 15:28:59 +02:00
Noel Grandin
f252b332dd fdo#46808, renamet awt::XToolkit2 to XToolkitExperimental..
..because we want to use the name for the new merged interface
for the Toolkit service.

Change-Id: Ib1e193c7d04729f6420ee6984231fd50181e59d3
2012-10-24 16:49:49 +02:00
Tor Lillqvist
d8feea6c28 Seems that on the emulator the y scale is -1, huh
Change-Id: I1ad30e278a5b04de3ee544c30c38f4765539157d
2012-10-22 15:18:29 +03:00
Tor Lillqvist
b8523dd612 Add animcore and dba mappings
Change-Id: If560563c884dc3ee4159aae24e62c5f56c544254
2012-10-15 13:47:52 +03:00
Tor Lillqvist
82bba1a2b3 Drop confusing comment
Change-Id: Ic702abecf1bd21893bd5d4dee532d2e342985e6e
2012-10-11 10:07:12 +03:00
Tor Lillqvist
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
Tor Lillqvist
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
Tor Lillqvist
6848bcf6e4 More libs
Change-Id: I7921ac41a31f545a74ec2981dda9c30f40d4b4d9
2012-10-11 10:07:10 +03:00
Tor Lillqvist
5b195fbcf7 Even more libs
Change-Id: I055b3d1a3105475883283c32a46141c38ed350fa
2012-10-11 10:07:09 +03:00
Tor Lillqvist
89372ae703 More libs
Change-Id: I4f717cfdf8e13044931e6820cc9fe6f74fc8aa7f
2012-10-11 10:07:08 +03:00
Tor Lillqvist
8ede8ee2ce Some more logging
Change-Id: Ib901de4a10cb18ce8e1f5d0293c61ab0eed2a4e8
2012-10-11 10:07:07 +03:00
Tor Lillqvist
c11a906a67 More libs
Change-Id: I83214fffadf68c6d92e129fd8f89f671fd9bc1c2
2012-10-11 10:07:07 +03:00
Tor Lillqvist
925b118a26 More libs
Change-Id: I2ea26d46f22620d567a23412d7780a95e2715af2
2012-10-11 10:07:06 +03:00
Tor Lillqvist
602f93da37 Link in more libs
Change-Id: I5e016a061ea4206966757cda2d6681617b45b550
2012-10-11 10:07:06 +03:00
Tor Lillqvist
8ab89346ba Add some more components/libraries
Change-Id: I2dba9bceee4c68b551ed8ed9239e93ea9ae93117
2012-10-11 10:07:06 +03:00
Tor Lillqvist
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
Anurag Jain
37a2fa5d5a fdo#51304: Remove the author of some java source files
This patch remove some '@author' for Java souce files, and removes some
commented code founded when removing the '@author'.

Change-Id: Ic4fcd028a9cdbd85c693d93bcd48e41f36386d22
2012-10-01 14:10:03 +02:00
Michael Meeks
e989d16748 dung out no longer needed initUCBHelper methods; thanks to sberg. 2012-09-19 18:41:45 +01:00
Tor Lillqvist
f9e88410cf Drop misleading comment
Change-Id: I90bc8870fcc7919f2b9c224160d7cb2e7ef285e7
2012-09-04 14:01:39 +03:00
Matúš Kukan
dc8f9877d1 libmerged: another small component libraries for android
Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad
2012-09-01 21:06:12 +02:00
Matúš Kukan
3f750f8e7b merge more, mostly small libraries for android
Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0
2012-08-25 12:45:36 +02:00
Matúš Kukan
4d7b955705 libmerged: add more libraries
Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05
2012-08-25 12:45:35 +02:00
Tor Lillqvist
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
Tor Lillqvist
07df4c9ed0 fileacc is in merged
Change-Id: If58adf2558c2baac51f91d621b75f2d37f935dfd
2012-08-23 22:26:00 +03:00
Tor Lillqvist
811751bbad Don't hardcode jni/Application.mk either
Change-Id: Id8787a04a3b1720490e7d79a254ca11835df242a
2012-08-23 12:37:21 +03:00
Tor Lillqvist
c02e838ec2 Factor out the Android APP_ABI sanely instead of copy-paste galore
Change-Id: I66e97d73c410ac6f2e481ba9b2b22183f57438bd
2012-08-23 12:28:59 +03:00
Tor Lillqvist
e9f3727313 Don't be shy
Change-Id: I806dcac11667abfd89a3202ed56e6370e18e185d
2012-08-20 17:36:06 +03:00
Matúš Kukan
4967a9d8f9 libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
2012-08-20 11:22:22 +02:00
Tor Lillqvist
ff8681a3b0 Add the fileacc library
Change-Id: Id6ef637ac0fec76ecea6be7aef6bbfc92a7f05ec
2012-08-20 09:49:17 +03:00
Matúš Kukan
5f9774ed5f merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
2012-08-13 01:48:57 +02:00
Tor Lillqvist
cc37b54230 Silence the annoyingly verbose vcl OSL_TRACEs
Change-Id: Ibd7c6ac56e56cf0e3e706a905603ef1a17a4579c
2012-08-09 10:53:42 +03:00
Tor Lillqvist
e8533bb028 Fix edit mistake, the point is to not include the SDK build.xml here
Change-Id: I3cfd5819be8075869906dac3b963b4d0b2cf2890
2012-08-09 10:53:41 +03:00