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=8d9704be1e94f76c8fe1cd47658f9d07eb02e123;hb=2619585ad0a13a369f3983f9c2d85b25778e4f30;hpb=4a6a5026fce3865db745c1c71a17353639685476

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 8d9704be1e..702c28fee7 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -26,14 +26,14 @@ 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;
 
 /** 
   <p><code>FfsProcess</code> is a class to find the corresponding FFS layout. </p>
   
-  <p>Property <code>COMMON_FILE</code> specified which file to search. The element
-  in <code>COMMON_FILE</code> is like following: </p>
+  <p>The FFS Layout is like following: </p>
   
   <pre>
     &lt;Ffs type="APPLICATION"&gt;
@@ -104,22 +104,20 @@ public class FfsProcess {
     }
 
     /**
-      Find the corresponding FFS layout in <code>COMMON_FILE</code> if it
-      does not specify in module's surface area. 
+      Find the corresponding FFS layout in <code>FPD</code>. 
       
       @param buildType Current module's component type
       @param project Ant project
       @return whether find the corresponding FFS layout
       @throws BuildException
-              If specified COMMON_FILE XML file is not valide.
+              If can't find FFS Layout in FPD.
     **/
     public boolean initSections(String buildType, Project project, FpdModuleIdentification fpdModuleId) throws BuildException {
         //
         // Try to find Ffs layout from FPD file
         //
-        SurfaceAreaQuery.push(GlobalData.getFpdBuildOptions());
-        BuildOptionsDocument.BuildOptions.Ffs[] ffsArray = SurfaceAreaQuery.getFpdFfs();
-        SurfaceAreaQuery.pop();
+        SurfaceAreaQuery saq = new SurfaceAreaQuery(GlobalData.getFpdBuildOptionsMap());
+        BuildOptionsDocument.BuildOptions.Ffs[] ffsArray = saq.getFpdFfs();
         for (int i = 0; i < ffsArray.length; i++) {
             if (isMatch(ffsArray[i].getFfsKey(), buildType)) {
                 ffsXmlObject = ffsArray[i];
@@ -132,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!");            
         }