Build also the DocumentLoader test Android app with gbuild

Serialize the Ant cleaning and building of android/abs-lib so that one
Ant is not cleaning it while another is building something that
depends on it.

Change-Id: I22fde47bf84208fa129b8f6a65a2314c885451a0

4 files changed, 40 insertions, 2 deletions

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index be2692718ef4..f18c18739b31 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -42,7 +42,7 @@ properties:
 install: build-ant
 	unset JAVA_HOME && $(ANT) debug install
 	@echo
-	@echo 'Run it with something like what "make run" does (see Makefile)'
+	@echo 'Run it with "make run"'
 	@echo
 
 uninstall:
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
new file mode 100644
index 000000000000..d4007e7ad9ed
--- /dev/null
+++ b/android/CustomTarget_docloader.mk
@@ -0,0 +1,33 @@
+# -*- 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/docloader))
+
+docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
+
+# Depending on sw and sc modules hopefully means that all libraries and other
+# files from there (plus all those they depend on), that DocumentLoader needs
+# from solver will have been built? Or should we just move the stuff from
+# android/experimental/DocumentLoader/Makefile here, and depend on them
+# explicitly?
+$(call gb_CustomTarget_get_target,android/docloader) : \
+	$(docloader_DIR)/done \
+	$(call gb_Module_get_target,sw) \
+	$(call gb_Module_get_target,sc)
+
+$(docloader_DIR)/done : $(gb_Helper_PHONY)
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
+# Lock needed to serialize the Ant cleaning/building which cleans/builds also
+# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be
+# cleaning out abs-lib while another is building stuff that depends on
+# it. yeah, this sucks
+	cd $(SRCDIR)/android/experimental/DocumentLoader && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all"
+	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+	cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+
+# vim: set noet sw=4 ts=4:
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index 1d552f59ac8b..e3f08d7cef96 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -14,7 +14,11 @@ $(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) clean && $(MAKE) all
+# Lock needed to serialize the Ant cleaning/building which cleans/builds also
+# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be
+# cleaning out abs-lib while another is building stuff that depends on
+# it. yeah, this sucks
+	cd $(SRCDIR)/android/sdremote && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all"
 	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 	cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
 
diff --git a/android/Module_android.mk b/android/Module_android.mk
index 2f0d76ede747..a0a9fa354cf9 100644
--- a/android/Module_android.mk
+++ b/android/Module_android.mk
@@ -12,6 +12,7 @@ ifeq ($(OS),ANDROID)
 
 $(eval $(call gb_Module_add_targets,android,\
     CustomTarget_sdremote \
+    CustomTarget_docloader \
 ))
 
 endif