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

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
index 9fb7a43ce9bde3eb77e1b0431a3e34e8d36a5843..28e2a296f156bd91fedfa705aee12aec2f8fc5c8 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -65,16 +65,15 @@ public class AutogenLibOrder {
             // Add libraryInstance in to libInstanceList.\r
             // \r
             Map<String, XmlObject> libDoc = GlobalData.getDoc(libraryList[i], arch);\r
-            SurfaceAreaQuery.push(libDoc);\r
-            libInstanceNode = new LibraryInstanceNode (libraryList[i],SurfaceAreaQuery.getLibConstructorName(), SurfaceAreaQuery.getLibDestructorName());\r
+            SurfaceAreaQuery saq = new SurfaceAreaQuery(libDoc);\r
+            libInstanceNode = new LibraryInstanceNode (libraryList[i],saq.getLibConstructorName(), saq.getLibDestructorName());\r
             libInstanceList.add(libInstanceNode);\r
             \r
             //\r
             // Add library instance and consumed library class list to\r
             // libInstanceMap.\r
             //\r
-            libClassConsmList = SurfaceAreaQuery\r
-                    .getLibraryClasses(CommonDefinition.ALWAYSCONSUMED, arch);\r
+            libClassConsmList = saq.getLibraryClasses(CommonDefinition.ALWAYSCONSUMED, arch);\r
             if (libClassConsmList != null) {\r
                 String[] classStr = new String[libClassConsmList.length];\r
                 for (int k = 0; k < libClassConsmList.length; k++) {\r
@@ -92,8 +91,7 @@ public class AutogenLibOrder {
             //\r
             // Add library class and library instance map.\r
             //\r
-            libClassDeclList = SurfaceAreaQuery\r
-                    .getLibraryClasses(CommonDefinition.ALWAYSPRODUCED, arch);\r
+            libClassDeclList = saq.getLibraryClasses(CommonDefinition.ALWAYSPRODUCED, arch);\r
             if (libClassDeclList != null) {\r
                 for (int j = 0; j < libClassDeclList.length; j++) {\r
                     if (this.libClassMap.containsKey(libClassDeclList[j])) {\r
@@ -107,7 +105,6 @@ public class AutogenLibOrder {
                     }\r
                 }\r
             }\r
-            SurfaceAreaQuery.pop();\r
         }\r
 \r
         //\r