summaryrefslogtreecommitdiff
path: root/android/CustomTarget_android_desktop.mk
AgeCommit message (Collapse)Author
2015-01-26android: Fix release build via top level 'make'.Jan Holesovsky
Change-Id: I342e3dfd1e142d4be14162fd8a68876d038ed5ea
2014-09-18Android: merge LibreOffice4Android into LOAndroid3Jacobo Aragunde Pérez
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-01-14Copy the built .apks to where push_nightlies.sh will find them for uploadingTor Lillqvist
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
2013-11-07remove INPATH and PROEXTMichael Stahl
- 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-09-10Don't bother building the DocumentLoader Android app every timeTor Lillqvist
Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
2013-03-13Copy the .apks where the daily build uploader will find themTor Lillqvist
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-01fix android build in separate dirPeter Foley
Change-Id: Id7cf80e1da87a56dee645dc01e64dedc4a8586ab
2013-03-01Cleanups to the android and ios makefileryTor Lillqvist
Also build the "desktop" app from gbuild. Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063