Remove stand-alone module judge when parse FPD file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1415 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 9b4dfa3486c7b1c93a26ffde9412591bf09c4854..7ec12b042721d9f6c1403c7c65d443e882e8d4e3 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -342,7 +342,7 @@ public class GenBuildTask extends Ant {
         //\r
         FpdParserTask fpdParser = new FpdParserTask();\r
         fpdParser.setProject(getProject());\r
-        fpdParser.parseFpdFile(platformId.getFpdFile(), moduleId);\r
+        fpdParser.parseFpdFile(platformId.getFpdFile());\r
         PropertyManager.setProperty("ARCH", fpdParser.getAllArchForModule(moduleId));\r
 \r
         //\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 46fe580c762d74ed2a56f3f9836ab0832a68d81b..488451554796b4854da61b7ce8fa988cc1f311ea 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -305,21 +305,17 @@ public class FpdParserTask extends Task {
       @throws BuildException\r
                   FPD file is not valid.\r
     **/\r
-    public void parseFpdFile(File fpdFile, ModuleIdentification singleModuleId) throws BuildException {\r
+    public void parseFpdFile(File fpdFile) throws BuildException {\r
         this.fpdFile = fpdFile;\r
-        parseFpdFile(singleModuleId);\r
     }\r
 \r
-    private void parseFpdFile() throws BuildException {\r
-        parseFpdFile(null);\r
-    }\r
     /**\r
       Parse FPD file.\r
 \r
       @throws BuildException\r
                   FPD file is not valid.\r
      **/\r
-    private void parseFpdFile(ModuleIdentification singleModuleId) throws BuildException {\r
+    private void parseFpdFile() throws BuildException {\r
         try {\r
             XmlObject doc = XmlObject.Factory.parse(fpdFile);\r
 \r
@@ -359,7 +355,7 @@ public class FpdParserTask extends Task {
             //\r
             // Parse all list modules SA\r
             //\r
-            parseModuleSAFiles(singleModuleId);\r
+            parseModuleSAFiles();\r
 \r
             //\r
             // TBD. Deal PCD and BuildOption related Info\r
@@ -379,12 +375,10 @@ public class FpdParserTask extends Task {
         }\r
     }\r
 \r
-\r
-\r
     /**\r
       Parse all modules listed in FPD file.\r
     **/\r
-    private void parseModuleSAFiles(ModuleIdentification singleModuleId) throws EdkException{\r
+    private void parseModuleSAFiles() throws EdkException{\r
         Map<FpdModuleIdentification, Map<String, XmlObject>> moduleSAs = SurfaceAreaQuery.getFpdModules();\r
 \r
         //\r
@@ -395,18 +389,6 @@ public class FpdParserTask extends Task {
         while (iter.hasNext()) {\r
             FpdModuleIdentification fpdModuleId = (FpdModuleIdentification) iter.next();\r
 \r
-            //\r
-            // If is stand-alone module build, just parse this module, pass others\r
-            //\r
-            if (singleModuleId != null) {\r
-                //\r
-                // pass others modules\r
-                //\r
-                if ( ! fpdModuleId.getModule().equals(singleModuleId)) {\r
-                    continue ;\r
-                }\r
-            }\r
-            \r
             //\r
             // Judge if Module is existed?\r
             // TBD\r