Update GenBuild to append FLAGS from FPD files to the FLAGS defined in tools_def.txt

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1657 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 b053bdd566787aa57d829906428840fa3de49fda..99767ab4f2278c156867ca00905797c630369bba 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -488,10 +488,19 @@ public class GenBuildTask extends Ant {
             //\r
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FLAGS;\r
             String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);\r
             //\r
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FLAGS;\r
             String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);\r

-            Set<String> addset = new LinkedHashSet<String>();\r
-            Set<String> subset = new LinkedHashSet<String>();\r
-            putFlagsToSet(addset, cmdFlags);\r
-            getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
+            if (cmdFlags != null) \r
+            {\r
+//              Set<String> addset = new LinkedHashSet<String>();\r
+//              Set<String> subset = new LinkedHashSet<String>();\r
+//              putFlagsToSet(addset, cmdFlags);\r
+//              getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
+              getProject().setProperty(cmd[m] + "_FLAGS", cmdFlags);\r
+            } \r
+            else \r
+            {\r
+              getProject().setProperty(cmd[m] + "_FLAGS", "");\r
+            }\r
+\r

 \r
             //\r
             // Set CC_EXT\r
 \r
             //\r
             // Set CC_EXT\r