Change GenBuildLogger format.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / FfsProcess.java

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