diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-09-12 10:40:59 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2014-09-18 20:52:01 +0000 |
| commit | 71832a527a936bbb8e76154cbd3ffc491ea31b58 (patch) | |
| tree | 66d582cbf1e193c0f4791f5b45393e50059006c6 /android/CustomTarget_android_desktop.mk | |
| parent | c184e32d5976e751b8d08577bd256232a67917c5 (diff) | |
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>
Diffstat (limited to 'android/CustomTarget_android_desktop.mk')
| -rw-r--r-- | android/CustomTarget_android_desktop.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk index ca0d0c517a24..e301ee9fcdaa 100644 --- a/android/CustomTarget_android_desktop.mk +++ b/android/CustomTarget_android_desktop.mk @@ -13,15 +13,13 @@ android_desktop_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/D $(call gb_CustomTarget_get_target,android/desktop) : \ $(android_desktop_DIR)/done -# We know that CustomTarget_lo4android.mk is included before this file -# in Module_android.mk, so lo4android_DIR is defined. We want that to -# be built completely first, so that we can serialize Ant access to -# Bootstrap and abs-lib, which are used by Desktop (this makefile), -# LibreOffice4Android and sdremote. We don't want one Ant to be -# cleaning out one place while another is building stuff that depends -# on it. Yeah, this sucks +# We want that to be built completely first, +# so that we can serialize Ant access to Bootstrap, which is used +# by several LO-android apps. We don't want one Ant to be cleaning +# out Bootstrap while another is building stuff that depends on it. +# Yeah, this sucks -$(android_desktop_DIR)/done : $(lo4android_DIR)/done +$(android_desktop_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script |