X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fglobal%2FSurfaceAreaQuery.java;h=b95c389592a051a011fa0d8e38e62c06d4a3fdd3;hp=78bea2a43492777e2a827c77d171e51348c21dd0;hb=e3cc406130b14c020c75e3a169f94ba001bf2128;hpb=700279a971c1f603a72a45455be4b4f842ce39d9

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 78bea2a434..b95c389592 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -613,8 +613,7 @@ public class SurfaceAreaQuery {
 			List archList = libraryClassList[i].getSupArchList();
             List moduleTypeList = libraryClassList[i].getSupModuleList();
 			if ((arch == null || contains(archList, arch))
-                && (moduleType == null || contains(moduleTypeList, moduleType)
-                    || contains(moduleTypeList, EdkDefinitions.MODULE_TYPE_BASE))) {
+                && (moduleType == null || contains(moduleTypeList, moduleType))) {
                 libraryClassName.add(libraryClassList[i].getKeyword());
 			}
         }
@@ -1493,6 +1492,22 @@ public class SurfaceAreaQuery {
         return a.getDomNode();
     }
 
+    public Node[] getFpdUserExtensions() {
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and not(@Identifier='1') and not(@Identifier='0')]" };
+
+        Object[] queryResult = get("PlatformSurfaceArea", xPath);
+        if (queryResult == null || queryResult.length == 0) {
+            return new Node[0];
+        }
+
+        Node[] nodeList = new Node[queryResult.length];
+        for (int i = 0; i < queryResult.length; ++i) {
+            UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[i];
+            nodeList[i] = a.getDomNode();
+        }
+
+        return nodeList;
+    }
     /**
      * Retrieve FV image option information
      *