summaryrefslogtreecommitdiffstats
path: root/android/Module_android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Skip the 'desktop' app for nowTor Lillqvist2014-12-021-1/+0
| | | | Change-Id: I040bd49f8cfeec74c3225135a110140c1816be43
* Android: merge LibreOffice4Android into LOAndroid3Jacobo Aragunde Pérez2014-09-181-1/+0
| | | | | | | | | | | | | | | | | | 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>
* LOAndroid3: ant/make for building, Bootstrap projectTomaž Vajngerl2014-06-301-0/+1
| | | | | | | | | 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
* Add CustomTarget_android_desktop back.Matúš Kukan2014-02-081-1/+2
| | | | Change-Id: I4bad098055c6c3b34dd5f02caf17df13cf4df797
* moved impress remote clients to a separate repositoryNorbert Thiebaud2014-01-301-8/+0
| | | | | Change-Id: I654e3af31a6915f08ff808b351d304da773ad267 see: git://gerrit.libreoffice.org/impress_remote
* Separate Impress Remote from Android build.Andrzej J.R. Hunt2013-11-201-1/+8
| | | | | | | | | | | | | | | | | 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>
* Don't bother building the DocumentLoader Android app every timeTor Lillqvist2013-09-101-1/+0
| | | | Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
* Cleanups to the android and ios makefileryTor Lillqvist2013-03-011-0/+1
| | | | | | Also build the "desktop" app from gbuild. Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063
* Build also LibreOffice4AndroidTor Lillqvist2012-09-101-0/+1
| | | | Change-Id: I81f241d830bc914c7ddf3cce23fb6bb48f30e89b
* Build also the DocumentLoader test Android app with gbuildTor Lillqvist2012-08-221-0/+1
| | | | | | | | 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
* Add the android module to gbuildTor Lillqvist2012-08-211-0/+19
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