Commit Graph

11 Commits

Author SHA1 Message Date
1cf5801c49 Skip the 'desktop' app for now
Change-Id: I040bd49f8cfeec74c3225135a110140c1816be43
2014-12-02 09:12:43 +02:00
71832a527a Android: merge LibreOffice4Android into LOAndroid3
This commit merges the code of the document browser found in
android/experimental/LibreOffice4Android into the new document viewer
at LOAndroid3. All the source and resources is moved, and some
duplicated files are removed.

From now on the apk generated by LOAndroid3 will provide the document
browser too.

Slightly modified the build files of ExperimentalDesktop project
because they depended on LibreOffice4Android being built.

Change-Id: I0579afda7b570509ca4d3873c28a13fcbeeb5ab8
Reviewed-on: https://gerrit.libreoffice.org/11487
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2014-09-18 20:52:01 +00:00
a6ecd8b2a9 LOAndroid3: ant/make for building, Bootstrap project
LOAndroid3 is based of LibreOffice4Android project which uses
ant/make for building. By using LibreOffice4Android as the base,
the project creates a APK archive which has all needed files
to start LibreOffice in Android environment.

Change-Id: I697d5f727bdaf93e774144ad597d7081d2609908
2014-06-30 14:48:03 +02:00
67316dd9ec Add CustomTarget_android_desktop back.
Change-Id: I4bad098055c6c3b34dd5f02caf17df13cf4df797
2014-02-08 08:58:28 +01:00
bab7eebba1 moved impress remote clients to a separate repository
Change-Id: I654e3af31a6915f08ff808b351d304da773ad267
see: git://gerrit.libreoffice.org/impress_remote
2014-01-30 18:54:36 -06:00
24b4610e10 Separate Impress Remote from Android build.
Previously the Impress Remote app could only be built within
gbuild when building the entirety of LO for Android, it can
now be enabled separately to be built within any LO build.

(Note that the app could still be built separately without doing a
full Android build of LO by using the android build tools and/or IDE.)

Conflicts:
	config_host.mk.in

Change-Id: I21d4389082a1492a3c9029d630f3fff97d9ba99a
Reviewed-on: https://gerrit.libreoffice.org/6146
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-11-20 14:41:51 -06:00
3b9f9a5a4b Don't bother building the DocumentLoader Android app every time
Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
2013-09-10 11:37:54 +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
1260555e28 Build also LibreOffice4Android
Change-Id: I81f241d830bc914c7ddf3cce23fb6bb48f30e89b
2012-09-10 14:15:11 +03:00
e2a7989765 Build also the DocumentLoader test Android app with gbuild
Serialize the Ant cleaning and building of android/abs-lib so that one
Ant is not cleaning it while another is building something that
depends on it.

Change-Id: I22fde47bf84208fa129b8f6a65a2314c885451a0
2012-08-22 14:29:36 +03:00
fae45f59b8 Add the android module to gbuild
Just build the sdremote app for now. Note that this is a pure Java
app with no dependencies on (native) code (or Java code, for that
matter) from rest of LO.

Probably should drop the separate android/sdremote/Makfile and just do
what it does in android/CustomTarget_sdremote.mk instead.

Adding other Android apps (well, the LibreOffice4Android one likely)
to gbuild will require more complexity as they bundle native code, and
thus should depend on other modules first having been built. If one
wants to go really fancy, one could of course depend on the specific
libraries (and other files) being bundled. Let's see...

Change-Id: If10761479f348c4993eec40b7f8346edb77f0e0d
2012-08-21 13:58:28 +03:00