8155629: MODULES_FILTER should apply to imported modules
Reviewed-by: dholmes, tbell, mchung
--- a/make/common/Modules.gmk Thu Apr 28 16:18:59 2016 +0200
+++ b/make/common/Modules.gmk Thu Apr 28 17:14:59 2016 +0200
@@ -186,7 +186,8 @@
$(call GetModuleNameFromModuleInfo, $(MODULE_INFOS))))
FindImportedModules = \
- $(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*)))
+ $(filter-out $(MODULES_FILTER), \
+ $(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*))))
# Find all source dirs for a particular module
# $1 - Module to find source dirs for