move android and ios to tail_build

Change-Id: Ic192b063a4ccc1249194bc7a62a8a90682de08f0

5 files changed, 6 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index 13c960ed053b..df983391d51c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,12 +184,6 @@ bootstrap: compilerplugins
 #
 build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build all slowcheck
-ifeq ($(OS),ANDROID)
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) android
-endif
-ifeq ($(OS),IOS)
-	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
-endif
 
 build-nocheck : export SKIP_TESTS := YES
 build-nocheck : build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 0469a4bb5abc..538c5de362b3 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_Module,tail_build))
 $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	accessibility \
 	$(call gb_Helper_optional,AFMS,afms) \
+	android \
 	animations \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	apple_remote \
@@ -97,6 +98,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	$(call gb_Helper_optional,DESKTOP,idlc) \
 	instsetoo_native \
 	io \
+	ios \
 	javaunohelper \
 	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
 	$(call gb_Helper_optional,JPEG,jpeg) \
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index ae053508bc3e..878c6df02bb7 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -12,7 +12,7 @@ sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote)
 
 $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
 
-$(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
 	mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
diff --git a/ios/CustomTarget_Viewer_app.mk b/ios/CustomTarget_Viewer_app.mk
index 2ccbf841284b..c92092bd0e6c 100644
--- a/ios/CustomTarget_Viewer_app.mk
+++ b/ios/CustomTarget_Viewer_app.mk
@@ -134,7 +134,8 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,Viewer)
 else
 # When run just from the command line, we don't have any app bundle to
 # copy or move the executable to. So do nothing.
-$(call gb_CustomTarget_get_target,ios/Viewer_app) : $(call gb_Executable_get_target,Viewer)
+$(call gb_CustomTarget_get_target,ios/Viewer_app) : $(call gb_Executable_get_target,Viewer) \
+	$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 
 $(call gb_CustomTarget_get_clean_target,ios/Viewer_app) :
 # Here we just assume that Xcode's settings are default, or something
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 52c211321acb..1562cff33e6a 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -154,7 +154,7 @@ gb_Module__debug_enabled = \
        $(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR)))
 
 define gb_Module_Module
-$(if $(filter-out tail_build instsetoo_native,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1)))
+$(if $(filter-out tail_build instsetoo_native android ios,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1)))
 gb_Module_ALLMODULES += $(1)
 gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK)