Add thread control classes. (2)

[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..ed94da38ed2bc0a3a51a0e5b3049e6a41ed8cfcf 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -84,12 +84,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 +115,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