[Libreoffice-commits] core.git: android/CustomTarget_android_desktop.mk android/CustomTarget_lo4android.mk

[Tor Lillqvist]

 android/CustomTarget_android_desktop.mk |    6 ++++++
 android/CustomTarget_lo4android.mk      |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit 06272f678b54e99757c89419acfdc9217c88abd7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 14 10:18:24 2014 +0200

    Copy the built .apks to where push_nightlies.sh will find them for uploading
    
    As such, personally I don't see the point in uploading daily builds of
    there boring useless test apps, but maybe it is good for marketing.
    
    Change-Id: I6601107719ed28b72e239a2af8b7e3578ee3388d

diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk
index 85aed67..ca0d0c5 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -24,6 +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
+# Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
+# still looks for the .apk, and we want fresh daily builds to be uploaded. Even if
+# the apps as such are mostly useless.
+# Us "foo" instead of the old INPATH
+	mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
+	cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
 
 $(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 e578e96..9b615ff 100644
--- a/android/CustomTarget_lo4android.mk
+++ b/android/CustomTarget_lo4android.mk
@@ -23,6 +23,12 @@ $(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
+# Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
+# still looks for the .apk, and we want fresh daily builds to be uploaded. Even if
+# the apps as such are mostly useless.
+# Us "foo" instead of the old INPATH
+	mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
+	cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
 
 $(call gb_CustomTarget_get_clean_target,android/lo4android) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)