Remove static from SurfaceAreaQuery.java for preparing parallel build.(1)

[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 cb699da34e28d1f994426d71ed21f9e5c0fe7ef8..66ad11ab5567675fd3e0d79382f51b24fd1fa4b6 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -84,6 +84,12 @@ 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
@@ -115,9 +121,9 @@ public class FfsProcess {
         //\r
         // Try to find Ffs layout from FPD file\r
         //\r
-        SurfaceAreaQuery.push(GlobalData.getFpdBuildOptions());\r
-        BuildOptionsDocument.BuildOptions.Ffs[] ffsArray = SurfaceAreaQuery.getFpdFfs();\r
-        SurfaceAreaQuery.pop();\r
+        saq.push(GlobalData.getFpdBuildOptions());\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