Cleanups to the android and ios makefilery

Also build the "desktop" app from gbuild.

Change-Id: I45fc265c9515b22e10bd7644f54dbfa23601e063

10 files changed, 75 insertions, 26 deletions

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 9eb1800ae51e..de025c0a578c 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -23,7 +23,7 @@ define COPYSO
 endef
 
 define COPYJAR
-cp $(1) libs
+mkdir -p libs && cp $(1) libs
 endef
 
 #
@@ -58,7 +58,7 @@ properties:
 	echo "APP_PLATFORM := android-14" >> jni/Application.mk
 
 install: build-ant
-	unset JAVA_HOME && $(ANT) debug install
+	unset JAVA_HOME && $(ANT) -quiet debug install
 	@echo
 	@echo 'Run it with "make run"'
 	@echo
@@ -67,7 +67,7 @@ uninstall:
 	$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
 
 clean: android_version_setup properties
-	$(ANT) clean
+	$(ANT) -quiet -keep-going clean
 	rm -rf assets libs $(SODEST) $(OBJLOCAL) $(BOOTSTRAPDIR)/no-resource-compress.xml
 
 #
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk
new file mode 100644
index 000000000000..bc62a338e6c7
--- /dev/null
+++ b/android/CustomTarget_android_desktop.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_CustomTarget_CustomTarget,android/desktop))
+
+android_desktop_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/Desktop)
+
+$(call gb_CustomTarget_get_target,android/desktop) : \
+	$(android_desktop_DIR)/done
+
+# We know that CustomTarget_lo4android.mk is included before this file
+# in Module_android.mk, so lo4android_DIR is defined. We want that to
+# be built completely first, so that we can serialize Ant access to
+# Bootstrap and abs-lib, which are used by Desktop (this makefile),
+# LibreOffice4Android, DocumentLoader and sdremote. We don't want one
+# Ant to be cleaning out one place while another is building stuff
+# that depends on it. Yeah, this sucks
+
+$(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 $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+
+$(call gb_CustomTarget_get_clean_target,android/desktop) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
+	cd $(SRCDIR)/android/experimental/desktop && $(MAKE) clean
+
+# vim: set noet sw=4 ts=4:
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
index e0d5fbb3ee8d..c30699e4bc08 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -13,16 +13,21 @@ docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/Documen
 $(call gb_CustomTarget_get_target,android/docloader) : \
 	$(docloader_DIR)/done
 
-# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is
-# defined.  We want that to be built completely first, so that we can
-# serialize Ant access to Bootstrap, which is used both by DocumentLoader and
-# sdremote. We don't want one Ant to be cleaning out Bootstrap while another
-# is building stuff that depends on it. Yeah, this sucks
+# We know that CustomTarget_sdremote.mk is included first, so
+# sdremote_DIR is defined. We want that to be built completely first,
+# so that we can serialize Ant access to Bootstrap, which is used both
+# by DocumentLoader and sdremote. We don't want one Ant to be cleaning
+# out Bootstrap while another is building stuff that depends on it.
+# Yeah, this sucks
 
 $(docloader_DIR)/done : $(sdremote_DIR)/done
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
-	cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) clean && $(MAKE) all
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
+	cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
 	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 	cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 
+$(call gb_CustomTarget_get_clean_target,android/docloader) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
+	cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) clean
+
 # vim: set noet sw=4 ts=4:
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk
index b0703ed07844..461067a8750c 100644
--- a/android/CustomTarget_lo4android.mk
+++ b/android/CustomTarget_lo4android.mk
@@ -13,17 +13,22 @@ lo4android_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LibreO
 $(call gb_CustomTarget_get_target,android/lo4android) : \
 	$(lo4android_DIR)/done
 
-# We know that CustomTarget_docloader.mk is included before this file in
-# Module_android-mk, so docloader_DIR is defined.  We want that to be built
-# completely first, so that we can serialize Ant access to Bootstrap and
-# abs-lib, which are used by LibreOffice4Android, DocumentLoader and
-# sdremote. We don't want one Ant to be cleaning out one place while another
-# is building stuff that depends on it. Yeah, this sucks
+# We know that CustomTarget_docloader.mk is included before this file
+# in Module_android.mk, so docloader_DIR is defined. We want that to
+# be built completely first, so that we can serialize Ant access to
+# Bootstrap and abs-lib, which are used by LibreOffice4Android (this
+# makefile), DocumentLoader and sdremote. We don't want one Ant to be
+# cleaning out one place while another is building stuff that depends
+# on it. Yeah, this sucks
 
 $(lo4android_DIR)/done : $(docloader_DIR)/done
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
-	cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) clean && $(MAKE) all
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
+	cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
 	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 	cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 
+$(call gb_CustomTarget_get_clean_target,android/lo4android) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
+	cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) clean
+
 # vim: set noet sw=4 ts=4:
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index 878c6df02bb7..69a572a7d285 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -13,9 +13,13 @@ sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote)
 $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
 
 $(sdremote_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
-	cd $(SRCDIR)/android/sdremote && $(MAKE) clean && $(MAKE) all
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
+	cd $(SRCDIR)/android/sdremote && $(MAKE) all
 	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 	cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 
+$(call gb_CustomTarget_get_clean_target,android/sdremote) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
+	cd $(SRCDIR)/android/sdremote && $(MAKE) clean
+
 # vim: set noet sw=4 ts=4:
diff --git a/android/Module_android.mk b/android/Module_android.mk
index d28b27039ee9..2e225b5fbc4a 100644
--- a/android/Module_android.mk
+++ b/android/Module_android.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,android,\
     CustomTarget_sdremote \
     CustomTarget_docloader \
     CustomTarget_lo4android \
+    CustomTarget_android_desktop \
 ))
 
 endif
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index c0e9ca8fb793..136f2010989b 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -125,7 +125,7 @@ build-ant: android_version_setup copy-stuff link-so properties
 	    $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
 	done
 #
-	unset JAVA_HOME && $(ANT) debug
+	unset JAVA_HOME && $(ANT) -quiet debug
 
 run:
 	adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index d0ae325c3601..d33bcae6a3cb 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -128,7 +128,7 @@ build-ant: android_version_setup copy-stuff link-so properties
 	    $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
 	done
 #
-	unset JAVA_HOME && $(ANT) debug
+	unset JAVA_HOME && $(ANT) -quiet debug
 
 run:
 	adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input /assets/test1.odt
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 7069cb301876..d4b79454e0c1 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -153,7 +153,7 @@ setup-jars:
 	done
 
 build-ant: android_version_setup copy-stuff link-so properties setup-jars
-	unset JAVA_HOME && $(ANT) debug
+	unset JAVA_HOME && $(ANT) -quiet debug
 
 run:
 	$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/.Desktop
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 9d9712ad6a72..49fad9219b3b 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -11,14 +11,14 @@ include ../../config_host.mk
 all: properties translations.done
 	mkdir -p ../abs-lib/libs
 	cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs
-	$(ANT) debug
+	$(ANT) -quiet debug
 
 properties:
 	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../abs-lib/local.properties
 
 clean: properties translations.clean
-	$(ANT) clean
+	$(ANT) -quiet -keep-going clean
 
 install: all
 	$(ANDROID_SDK_HOME)/platform-tools/adb install -r ./bin/ImpressRemote-debug.apk
@@ -55,6 +55,6 @@ translations.done: $(foreach lang,$(call android_get_langlist),$(call android_ge
 translations.clean:
 	rm -rf $(foreach lang,$(call android_get_langlist),$(call android_get_podir,$(lang)))
 	rm -rf $(foreach lang,$(call android_get_langlist),translations-$(lang).db)
-	rm translations.done
+	rm -f translations.done
 
 # vim: set noet sw=4 ts=4: