diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/CustomTarget_android_desktop.mk | 8 | ||||
| -rw-r--r-- | android/CustomTarget_docloader.mk | 8 | ||||
| -rw-r--r-- | android/CustomTarget_lo4android.mk | 8 | ||||
| -rw-r--r-- | android/CustomTarget_sdremote.mk | 8 |
4 files changed, 24 insertions, 8 deletions
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk index 185f9ac16f06..a1e12d74c4c3 100644 --- a/android/CustomTarget_android_desktop.mk +++ b/android/CustomTarget_android_desktop.mk @@ -24,8 +24,12 @@ $(call gb_CustomTarget_get_target,android/desktop) : \ $(android_desktop_DIR)/done : $(lo4android_DIR)/done $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all - mkdir -p $(WORKDIR)/installation/bin - cp $(SRCDIR)/android/experimental/desktop/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/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + fi $(call gb_CustomTarget_get_clean_target,android/desktop) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk index 63fcfb7fb8e8..badcabd1b1cc 100644 --- a/android/CustomTarget_docloader.mk +++ b/android/CustomTarget_docloader.mk @@ -23,8 +23,12 @@ $(call gb_CustomTarget_get_target,android/docloader) : \ $(docloader_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all - mkdir -p $(WORKDIR)/installation/bin - cp $(SRCDIR)/android/experimental/DocumentLoader/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/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + fi $(call gb_CustomTarget_get_clean_target,android/docloader) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) 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) diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk index c5705bdefd35..65d9db8baf0a 100644 --- a/android/CustomTarget_sdremote.mk +++ b/android/CustomTarget_sdremote.mk @@ -15,8 +15,12 @@ $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done $(sdremote_DIR)/done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/sdremote && $(MAKE) all - mkdir -p $(WORKDIR)/installation/bin - cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-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/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + fi $(call gb_CustomTarget_get_clean_target,android/sdremote) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) |