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

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index dd812d8e8ababd70067f65d43a384d515326bc45..017c4e378c8dabd306c38c01b98638b942067589 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -62,6 +62,8 @@ public class PlatformBuildFileGenerator {
 \r
     private boolean isUnified = true;\r
     \r
+    private SurfaceAreaQuery saq = null;\r
+    \r
     private Project project;\r
     \r
     private String info = "DO NOT EDIT \n" \r
@@ -70,11 +72,12 @@ public class PlatformBuildFileGenerator {
         + "Abstract:\n"\r
         + "Auto-generated ANT build file for building EFI Modules and Platforms\n";\r
 \r
-    public PlatformBuildFileGenerator(Project project, Map<FpdModuleIdentification, String> outfiles, Map<String, Set<FpdModuleIdentification>> fvs, boolean isUnified){\r
+    public PlatformBuildFileGenerator(Project project, Map<FpdModuleIdentification, String> outfiles, Map<String, Set<FpdModuleIdentification>> fvs, boolean isUnified, SurfaceAreaQuery saq){\r
         this.project = project;\r
         this.outfiles = outfiles;\r
         this.isUnified = isUnified;\r
         this.fvs = fvs;\r
+        this.saq = saq;\r
         this.platformName = project.getProperty("PLATFORM");\r
     }\r
     \r
@@ -197,7 +200,7 @@ public class PlatformBuildFileGenerator {
         //\r
         // Get all valid FV name\r
         //\r
-        String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();\r
+        String[] validFv = saq.getFpdValidImageNames();\r
         \r
         //\r
         // For each valid FV, get all modules in sequence\r
@@ -312,7 +315,7 @@ public class PlatformBuildFileGenerator {
                 String fvOutputDir = project.getProperty("BUILD_DIR") + File.separatorChar \r
                                         + targetList[i] + "_" \r
                                         + toolchainList[j] + File.separatorChar + "FV";\r
-                String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();\r
+                String[] validFv = saq.getFpdValidImageNames();\r
                 for (int k = 0; k < validFv.length; k++) {\r
                     String inputFile = fvOutputDir + "" + File.separatorChar + validFv[k].toUpperCase() + ".inf";\r
                     Element fvEle = document.createElement("genfvimage");\r
@@ -507,7 +510,7 @@ public class PlatformBuildFileGenerator {
         Element ele = document.createElement("target");\r
         ele.setAttribute("name", "prebuild");\r
         \r
-        Node node = SurfaceAreaQuery.getFpdUserExtensionPreBuild();\r
+        Node node = saq.getFpdUserExtensionPreBuild();\r
         if (node != null) {\r
             //\r
             // For every Target and ToolChain\r
@@ -551,7 +554,7 @@ public class PlatformBuildFileGenerator {
         Element ele = document.createElement("target");\r
         ele.setAttribute("name", "postbuild");\r
         \r
-        Node node = SurfaceAreaQuery.getFpdUserExtensionPostBuild();\r
+        Node node = saq.getFpdUserExtensionPostBuild();\r
         if (node != null) {\r
             //\r
             // For every Target and ToolChain\r