X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFfsProcess.java;h=702c28fee765b2dbcf4bd7a94214ef2802a8d4a5;hp=66ad11ab5567675fd3e0d79382f51b24fd1fa4b6;hb=2619585ad0a13a369f3983f9c2d85b25778e4f30;hpb=83fba802560b3446de68ac1c280773cf1a4271be

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 66ad11ab55..702c28fee7 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -26,6 +26,7 @@ import org.tianocore.build.global.GlobalData;
 import org.tianocore.build.global.SurfaceAreaQuery;
 import org.tianocore.build.id.FpdModuleIdentification;
 import org.tianocore.common.definitions.EdkDefinitions;
+import org.tianocore.common.logger.EdkLog;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -84,12 +85,6 @@ public class FfsProcess {
     ///
     public static final String[][] sectionExt = EdkDefinitions.SectionTypeExtensions;
 
-    private SurfaceAreaQuery saq = null;
-    
-    public FfsProcess(SurfaceAreaQuery saq) {
-        this.saq = saq;
-    }
-    
     /**
       search in the type, if componentType is listed in type, return true; 
       otherwise return false.
@@ -121,9 +116,8 @@ public class FfsProcess {
         //
         // Try to find Ffs layout from FPD file
         //
-        saq.push(GlobalData.getFpdBuildOptions());
+        SurfaceAreaQuery saq = new SurfaceAreaQuery(GlobalData.getFpdBuildOptionsMap());
         BuildOptionsDocument.BuildOptions.Ffs[] ffsArray = saq.getFpdFfs();
-        saq.pop();
         for (int i = 0; i < ffsArray.length; i++) {
             if (isMatch(ffsArray[i].getFfsKey(), buildType)) {
                 ffsXmlObject = ffsArray[i];
@@ -136,7 +130,7 @@ public class FfsProcess {
         // Otherwise report warning message
         //
         if (buildType == null) {
-            System.out.println("Warning: this module doesn't specify a FfsFormatKey. ");
+            EdkLog.log(EdkLog.EDK_WARNING, "Warning: this module doesn't specify a FfsFormatKey. ");
         } else {
             throw new BuildException("Can't find the FfsFormatKey [" + buildType + "] attribute in the FPD file!");            
         }