X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Ffpd%2FFpdParserTask.java;h=21197b5c626ffac05961204a01cba979a2361864;hp=011e13de527af8a867d0d7b7f3dfc8a5809e32f9;hb=250258de0d6ed07201db565101d45f4d92729bce;hpb=21b50a2779659c2b5a5e2fb2631ab6d33655f759

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 011e13de52..21197b5c62 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -352,6 +352,7 @@ public class FpdParserTask extends Task {
             }
             Map<String, XmlObject> msaMap = GlobalData.getNativeMsa(baseName);
             Map<String, XmlObject> mbdMap = GlobalData.getNativeMbd(baseName);
+            Map<String, XmlObject> fpdMap = new HashMap<String, XmlObject>();
             Map<String, XmlObject> map = new HashMap<String, XmlObject>();
             //
             // Whether the Module SA has parsed before or not
@@ -363,9 +364,13 @@ public class FpdParserTask extends Task {
                 // Here we can also put platform Build override
                 //
                 map = op.override(mbdMap, msaMap);
-                Map<String, XmlObject> overrideMap = op.override(
-                                getPlatformOverrideInfo(moduleSAs[i]),
-                                OverrideProcess.deal(map));
+                fpdMap = getPlatformOverrideInfo(moduleSAs[i]);
+                XmlObject buildOption = (XmlObject)fpdMap.get("BuildOptions");
+                buildOption = (XmlObject)fpdMap.get("PackageDependencies");
+                buildOption = (XmlObject)fpdMap.get("BuildOptions");
+                buildOption = op.override(buildOption, platformBuildOptions);
+                fpdMap.put("BuildOptions", ((BuildOptionsDocument)buildOption).getBuildOptions());
+                Map<String, XmlObject> overrideMap = op.override(fpdMap, OverrideProcess.deal(map));
                 GlobalData.registerModule(baseName, overrideMap);
             } else {
                 map = GlobalData.getDoc(baseName);
@@ -460,6 +465,7 @@ public class FpdParserTask extends Task {
         Map<String, XmlObject> map = new HashMap<String, XmlObject>();
         map.put("SourceFiles", sa.getSourceFiles());
         map.put("Includes", sa.getIncludes());
+        map.put("PackageDependencies", null);
         map.put("Libraries", sa.getLibraries());
         map.put("Protocols", sa.getProtocols());
         map.put("Events", sa.getEvents());
@@ -472,7 +478,7 @@ public class FpdParserTask extends Task {
         map.put("Formsets", sa.getFormsets());
         map.put("Guids", sa.getGuids());
         map.put("Externs", sa.getExterns());
-        map.put("BuildOptions", platformBuildOptions);
+        map.put("BuildOptions", sa.getBuildOptions());//platformBuildOptions);
         return map;
     }