commit d1af74bd704e3fad10511ea7769a4b288795cb50
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 26 17:32:28 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 26 17:32:28 2017 +0000
tree 83030c84da73b3f88215c386053ef9fb1bdefa0c
parent 2f05802a78be87250b8ca4afb23c96c02aac1cfb
parent 0c821a98822efe62741ca7cc390675a394fb0024

Merge "Check for module names in LOCAL_ADDITIONAL_DEPENDENCIES"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index a178b55..a5ba75b 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -96,6 +96,13 @@
 # base_rules.mk, but it will fix the most common ones.
 LOCAL_ADDITIONAL_DEPENDENCIES := $(filter-out %.mk,$(LOCAL_ADDITIONAL_DEPENDENCIES))
 
+my_bad_deps := $(strip $(foreach dep,$(filter-out | ||,$(LOCAL_ADDITIONAL_DEPENDENCIES)),\
+                 $(if $(findstring /,$(dep)),,$(dep))))
+ifneq ($(my_bad_deps),)
+$(call pretty-warning,"Bad LOCAL_ADDITIONAL_DEPENDENCIES: $(my_bad_deps)")
+$(call pretty-error,"LOCAL_ADDITIONAL_DEPENDENCIES must only contain paths (not module names)")
+endif
+
 ###########################################################
 ## Validate and define fallbacks for input LOCAL_* variables.
 ###########################################################