X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Ffpd%2FFpdParserTask.java;h=b496e32ed5de3ea933167369a1b7573bbc15bb45;hp=106e6d6a072eec091ac5c0f94d7fb7869d773994;hb=f6390d375c84a8dd7adbc2c76381b6bd41e256d8;hpb=8d6ff4155f6626c4e17cc2e0cd2d0bb019b42405 diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java index 106e6d6a07..b496e32ed5 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java +++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java @@ -283,17 +283,20 @@ public class FpdParserTask extends Task { Set filesSet = fvs.get(validFv[i]); FpdModuleIdentification[] files = null; + if (moduleSeqSet == null) { if (filesSet != null) { files = filesSet.toArray(new FpdModuleIdentification[filesSet.size()]); } + } else if (filesSet == null) { + if (moduleSeqSet.size() != 0) { + throw new BuildException("Can not find any modules belongs to FV[" + validFv[i] + "], but listed some in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1']"); + } } else { // // if moduleSeqSet and filesSet is inconsistent, report error // - if (filesSet == null && moduleSeqSet.size() != 0) { - throw new BuildException("Can not find any modules belongs to FV[" + validFv[i] + "], but listed some in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1']"); - } else if(moduleSeqSet.size() != filesSet.size()){ + if(moduleSeqSet.size() != filesSet.size()){ throw new BuildException("Modules for FV[" + validFv[i] + "] defined in FrameworkModules and in BuildOptions.UserExtensions[@UserID='IMAGES' @Identifier='1'] are inconsistent. "); } else { //