diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/CustomTarget_android_desktop.mk | 6 | ||||
| -rw-r--r-- | android/CustomTarget_lo4android.mk | 6 | ||||
| -rw-r--r-- | android/CustomTarget_sdremote.mk | 6 |
3 files changed, 0 insertions, 18 deletions
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk index 1bb044607787..85aed673a410 100644 --- a/android/CustomTarget_android_desktop.mk +++ b/android/CustomTarget_android_desktop.mk @@ -24,12 +24,6 @@ $(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 -# 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_lo4android.mk b/android/CustomTarget_lo4android.mk index 9e54f3e3c6a0..e578e9696f60 100644 --- a/android/CustomTarget_lo4android.mk +++ b/android/CustomTarget_lo4android.mk @@ -23,12 +23,6 @@ $(call gb_CustomTarget_get_target,android/lo4android) : \ $(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 -# 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 65d9db8baf0a..0287eeb4b033 100644 --- a/android/CustomTarget_sdremote.mk +++ b/android/CustomTarget_sdremote.mk @@ -15,12 +15,6 @@ $(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 -# 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) |