Commit Graph

7 Commits

Author SHA1 Message Date
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
06272f678b Copy the built .apks to where push_nightlies.sh will find them for uploading
As such, personally I don't see the point in uploading daily builds of
there boring useless test apps, but maybe it is good for marketing.

Change-Id: I6601107719ed28b72e239a2af8b7e3578ee3388d
2014-01-14 10:21:53 +02:00
b800216933 remove INPATH and PROEXT
- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME

Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-07 14:27:50 -06:00
3b9f9a5a4b Don't bother building the DocumentLoader Android app every time
Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
2013-09-10 11:37:54 +03:00
46cb9a2982 Copy the .apks where the daily build uploader will find them
Sure, it is not "clean" to write to $(SRCDIR)/instsetoo_native/$(INPATH)/bin,
but as long as the push_nightlies.sh script looks in instsetoo_native for
.apks, that is where they need to go.

This partially reverts commit b89ea45e5ba32589f69b9539851a51fbe2199a85.

Change-Id: If1a0e50516f20c7571566a2cfa7e6a4b1dad30e4
2013-03-13 00:43:44 +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