RFR: JDK-8155629: MODULES_FILTER should apply to imported modules

[Tim Bell]

Erik:

On 04/28/16 05:43, David Holmes wrote:
> On 28/04/2016 10:33 PM, Erik Joelsson wrote:
>> We have a mechanism to exclude certain modules completely from a build.
>> This is handled with the MODULES_FILTER variable. It's currently flawed
>> in that it doesn't apply to imported modules (--with-import-modules).
>>
>> Bug: https://bugs.openjdk.java.net/browse/JDK-8155629
>> Patch:
>> diff -r d8b1e1832b0e make/common/Modules.gmk
>> --- a/make/common/Modules.gmk
>> +++ b/make/common/Modules.gmk
>> @@ -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)/*))))
>
> Seems reasonable.
>
> Thanks,
> David

Looks good to me as well.

/Tim

>
>>   # Find all source dirs for a particular module
>>   # $1 - Module to find source dirs for
>>
>>
>> /Erik