summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Module_tail_build.mk1
-rw-r--r--android/CustomTarget_docloader.mk9
2 files changed, 4 insertions, 6 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 270d6ec66972..e06241e6096b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
accessibility \
- android \
animations \
apple_remote \
autodoc \
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
index 326da49e4270..57266c5a3775 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -10,15 +10,14 @@ $(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
+# Depending on the tail_end module hopefully means that all libraries and
+# other files 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)
+ $(call gb_Module_get_target,tail_end)
# 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