Support MSA build options. Now the build options from four places: 1. tools_def.txt

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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index d45abcdcd8dfe713c8ed3b7fd807c6074994db68..28379796f48b531e0a9b17c9c5343d83b1531023 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -516,6 +516,13 @@ public class FpdParserTask extends Task {
             //\r
             GlobalData.addModuleToolChainOption(fpdModuleId, parseModuleBuildOptions(false));\r
             GlobalData.addModuleToolChainFamilyOption(fpdModuleId, parseModuleBuildOptions(true));\r
+            \r
+            //\r
+            // parse MSA build options\r
+            //\r
+            GlobalData.addMsaBuildOption(moduleId, parseMsaBuildOptions(false));\r
+            GlobalData.addMsaFamilyBuildOption(moduleId, parseMsaBuildOptions(true));\r
+    \r
             saq.pop();\r
         }\r
     }\r
@@ -536,6 +543,14 @@ public class FpdParserTask extends Task {
         return parseOptions(options);\r
     }\r
 \r
+    ToolChainMap parseMsaBuildOptions(boolean toolChainFamilyFlag) throws EdkException {\r
+        String[][] options = saq.getMsaBuildOptions(toolChainFamilyFlag);\r
+        if (options == null || options.length == 0) {\r
+            return new ToolChainMap();\r
+        }\r
+        return parseOptions(options);\r
+    }\r
+    \r
     private ToolChainMap parseOptions(String[][] options) throws EdkException {\r
         ToolChainMap map = new ToolChainMap();\r
         int flagIndex = ToolChainElement.ATTRIBUTE.value;\r