diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-10 11:25:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-10 11:37:54 +0300 |
| commit | 3b9f9a5a4baa06607110db644eff3af146802326 (patch) | |
| tree | 45aa8a2702e2c1fed1f1bc4c1f33c6579bd48a31 /android/CustomTarget_lo4android.mk | |
| parent | 8dc5941064c50fe0a61490e274d61eccb43fd089 (diff) | |
Don't bother building the DocumentLoader Android app every time
Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
Diffstat (limited to 'android/CustomTarget_lo4android.mk')
| -rw-r--r-- | android/CustomTarget_lo4android.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk index 651c435ff385..9e54f3e3c6a0 100644 --- a/android/CustomTarget_lo4android.mk +++ b/android/CustomTarget_lo4android.mk @@ -13,15 +13,14 @@ 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 (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 +# We know that CustomTarget_sdremote.mk is included first, so +# sdremote_DIR is defined. We want that to be built completely first, +# so that we can serialize Ant access to Bootstrap, which is used both +# by DocumentLoader and sdremote. We don't want one Ant to be cleaning +# out Bootstrap while another is building stuff that depends on it. +# Yeah, this sucks -$(lo4android_DIR)/done : $(docloader_DIR)/done +$(lo4android_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all # If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script |