diff options
Diffstat (limited to 'android/CustomTarget_lo4android.mk')
| -rw-r--r-- | android/CustomTarget_lo4android.mk | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk index b0703ed07844..461067a8750c 100644 --- a/android/CustomTarget_lo4android.mk +++ b/android/CustomTarget_lo4android.mk @@ -13,17 +13,22 @@ lo4android_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LibreO $(call gb_CustomTarget_get_target,android/lo4android) : \ $(lo4android_DIR)/done -# We know that CustomTarget_docloader.mk is included before this file in -# Module_android-mk, so docloader_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 LibreOffice4Android, DocumentLoader 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 know that CustomTarget_docloader.mk is included before this file +# in Module_android.mk, so docloader_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 LibreOffice4Android (this +# makefile), DocumentLoader 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 $(lo4android_DIR)/done : $(docloader_DIR)/done - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) - cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) clean && $(MAKE) all + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) + cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin +$(call gb_CustomTarget_get_clean_target,android/lo4android) : + $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) + cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) clean + # vim: set noet sw=4 ts=4: |