OpenJDK / jigsaw / jake
changeset 2009:887db7246c21
Fixed filtering of excluded modules
| author | erikj |
|---|---|
| date | Wed, 11 Nov 2015 10:24:58 +0100 |
| parents | 471d26171bcf |
| children | 6a4c7c3c200b |
| files | make/GensrcModuleInfo.gmk make/Images.gmk |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/GensrcModuleInfo.gmk Wed Nov 11 10:24:44 2015 +0100 +++ b/make/GensrcModuleInfo.gmk Wed Nov 11 10:24:58 2015 +0100 @@ -91,10 +91,6 @@ ifneq ($(MOD_FILES), ) # Only make this call if modification files are found for this module ALL_MODULES := $(call FindAllModules) - # Workaround until deploy is fully converted to new build - ifeq ($(BUILD_DEPLOY), true) - ALL_MODULES += jdk.javaws jdk.plugin jdk.deploy - endif # Read the contents of all the files into a variable. Replace space with / to # let space represent new lines in the variable as $(shell) normalizes all
--- a/make/Images.gmk Wed Nov 11 10:24:44 2015 +0100 +++ b/make/Images.gmk Wed Nov 11 10:24:58 2015 +0100 @@ -64,8 +64,8 @@ MAIN_MODULES += jdk.deploy.osx endif -JRE_MODULES := $(MAIN_MODULES) $(PROVIDER_MODULES) -JDK_MODULES := $(JRE_MODULES) $(TOOLS_MODULES) +JRE_MODULES := $(filter-out $(MODULES_FILTER), $(MAIN_MODULES) $(PROVIDER_MODULES)) +JDK_MODULES := $(filter-out $(MODULES_FILTER), $(JRE_MODULES) $(TOOLS_MODULES)) # Param 1 - Name of module define ReadImportMetaData