[Libreoffice-commits] .: 2 commits - android/CustomTarget_sdremote.mk android/sdremote

[Libreoffice Gerrit user]

 android/CustomTarget_sdremote.mk |    4 +++-
 android/sdremote/Makefile        |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d4a392476ce7b64936bbca9d62a3c59322311f67
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Aug 21 15:44:54 2012 +0300

    Clean first for reliability. Copy the apk so push_nightlies.sh finds it
    
    Change-Id: Ie14754deb796cc2a03e48b04b31983ddd26968cb

diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index e153410..1d552f5 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -14,6 +14,8 @@ $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
 
 $(sdremote_DIR)/done : $(gb_Helper_PHONY)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
-	cd $(SRCDIR)/android/sdremote && $(MAKE)
+	cd $(SRCDIR)/android/sdremote && $(MAKE) clean && $(MAKE) all
+	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 
 # vim: set noet sw=4 ts=4:
commit 59f7c64d248149aad773761b73f27c91fbae2962
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Aug 21 15:43:11 2012 +0300

    Add clean target
    
    Change-Id: Iacbca078aafd44f1da254b6c8ca5be1a2cb29a88

diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 9b56380..5cdf8ee 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -14,4 +14,7 @@ all:
 	cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs
 	$(ANT) debug
 
+clean:
+	$(ANT) clean
+
 # vim: set noet sw=4 ts=4: