X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fglobal%2FOverrideProcess.java;h=60f430f4588bb8117fa213cd0c44c43603a7e440;hp=9354def6ba38b8864d57d4d42516d3ea44410686;hb=250258de0d6ed07201db565101d45f4d92729bce;hpb=21b50a2779659c2b5a5e2fb2631ab6d33655f759

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java b/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java
index 9354def6ba..60f430f458 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java
@@ -42,6 +42,7 @@ import org.tianocore.ProtocolsDocument;
 import org.tianocore.SourceFilesDocument;
 import org.tianocore.SystemTablesDocument;
 import org.tianocore.VariablesDocument;
+import org.tianocore.PackageDependenciesDocument;
 
 /**
   This class is used to override surface area information. For example, MBD can
@@ -110,7 +111,7 @@ public class OverrideProcess {
     /// list of top elements of surface area
     ///
     public static String[] topElements = { "LibraryClassDefinitions",
-                    "SourceFiles", "Includes", "Libraries", "Protocols",
+                    "SourceFiles", "Includes", "PackageDependencies", "Libraries", "Protocols",
                     "Events", "Hobs", "PPIs", "Variables", "BootModes",
                     "SystemTables", "DataHubs", "Formsets", "Guids", "Externs",
                     "PcdCoded", "BuildOptions" };
@@ -178,6 +179,10 @@ public class OverrideProcess {
             newMap.put("Includes", ((IncludesDocument) map.get("Includes"))
                             .getIncludes());
         }
+        if (map.get("PackageDependencies") != null) {
+            newMap.put("PackageDependencies", ((PackageDependenciesDocument) map.get("PackageDependencies"))
+                            .getPackageDependencies());
+        }
         if (map.get("Libraries") != null) {
             newMap.put("Libraries", ((LibrariesDocument) map.get("Libraries"))
                             .getLibraries());
@@ -285,8 +290,11 @@ public class OverrideProcess {
         result.put("MsaHeader", override(l.get("MsaHeader"), null));
         result.put("MsaLibHeader", override(l.get("MsaLibHeader"), null));
         for (int i = 0; i < topElements.length; i++) {
-            result.put(topElements[i], override(h.get(topElements[i]), l
-                            .get(topElements[i])));
+            if (h != null) {
+                result.put(topElements[i], override(h.get(topElements[i]), l.get(topElements[i])));
+            } else {
+                result.put(topElements[i], override(l.get(topElements[i]), null));
+            }
         }
         return result;
     }
@@ -310,8 +318,7 @@ public class OverrideProcess {
         }
         XmlCursor hc = h.newCursor();
         if (h.getClass() != l.getClass()) {
-            System.out
-                            .println("Error: Two XmlObject does not with compliant format.");
+            System.out.println("Error: Two XmlObject does not with compliant format.");
             return null;
         }
         if (!hc.toFirstChild()) {