Merge "Check for module names in LOCAL_ADDITIONAL_DEPENDENCIES"

am: d1af74bd70

Change-Id: If269291261edc1b9dae42b61fd482d9b5cd5d80f
This commit is contained in:
Dan Willemsen 2017-10-26 17:40:30 +00:00 committed by android-build-merger
commit 67c3822303

View file

@ -96,6 +96,13 @@ endif
# 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.
###########################################################