- Fixed EDKT240. Now the Blank.pad file for alignment purpose will no longer be needed.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / global / SurfaceAreaQuery.java

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 78bea2a43492777e2a827c77d171e51348c21dd0..b95c389592a051a011fa0d8e38e62c06d4a3fdd3 100644 (file)
--- 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();\r
             List moduleTypeList = libraryClassList[i].getSupModuleList();\r
                        if ((arch == null || contains(archList, arch))\r
                        List archList = libraryClassList[i].getSupArchList();\r
             List moduleTypeList = libraryClassList[i].getSupModuleList();\r
                        if ((arch == null || contains(archList, arch))\r

-                && (moduleType == null || contains(moduleTypeList, moduleType)\r
-                    || contains(moduleTypeList, EdkDefinitions.MODULE_TYPE_BASE))) {\r
+                && (moduleType == null || contains(moduleTypeList, moduleType))) {\r

                 libraryClassName.add(libraryClassList[i].getKeyword());\r
                        }\r
         }\r
                 libraryClassName.add(libraryClassList[i].getKeyword());\r
                        }\r
         }\r


@@ -1493,6 +1492,22 @@ public class SurfaceAreaQuery {
         return a.getDomNode();\r
     }\r
 \r
         return a.getDomNode();\r
     }\r
 \r

+    public Node[] getFpdUserExtensions() {\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and not(@Identifier='1') and not(@Identifier='0')]" };\r
+\r
+        Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
+        if (queryResult == null || queryResult.length == 0) {\r
+            return new Node[0];\r
+        }\r
+\r
+        Node[] nodeList = new Node[queryResult.length];\r
+        for (int i = 0; i < queryResult.length; ++i) {\r
+            UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[i];\r
+            nodeList[i] = a.getDomNode();\r
+        }\r
+\r
+        return nodeList;\r
+    }\r

     /**\r
      * Retrieve FV image option information\r
      *\r
     /**\r
      * Retrieve FV image option information\r
      *\r