From 46cb9a29823073e042ea9e1c065328faafc53b80 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 13 Mar 2013 00:40:19 +0200 Subject: Copy the .apks where the daily build uploader will find them 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 --- android/CustomTarget_lo4android.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'android/CustomTarget_lo4android.mk') diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk index 30d0e1151e6a..651c435ff385 100644 --- a/android/CustomTarget_lo4android.mk +++ b/android/CustomTarget_lo4android.mk @@ -24,8 +24,12 @@ $(call gb_CustomTarget_get_target,android/lo4android) : \ $(lo4android_DIR)/done : $(docloader_DIR)/done $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all - mkdir -p $(WORKDIR)/installation/bin - cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(WORKDIR)/installation/bin +# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script +# still looks for the .apk, and we want fresh daily builds to be uploaded. + if test $(SRCDIR) = $(BUILDDIR); then \ + mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + fi $(call gb_CustomTarget_get_clean_target,android/lo4android) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) -- cgit