Fixed EDKT493. Added support to "SupModuleList" for checking if a library instance...

[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 17f7541e093594c61d767d03efd4f976f7e7e925..78bea2a43492777e2a827c77d171e51348c21dd0 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -38,6 +38,7 @@ import org.tianocore.build.id.PackageIdentification;
 import org.tianocore.build.id.PlatformIdentification;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
 import org.tianocore.common.exception.EdkException;\r
+import org.tianocore.common.definitions.EdkDefinitions;\r
 import org.w3c.dom.Node;\r
 \r
 /**\r
@@ -593,7 +594,7 @@ public class SurfaceAreaQuery {
      *          xpath\r
      * @returns null if nothing is there\r
      */\r
-    public String[] getLibraryClasses(String usage, String arch) {\r
+    public String[] getLibraryClasses(String usage, String arch, String moduleType) {\r
         String[] xPath;\r
         if (usage == null || usage.equals("")) {\r
             xPath = new String[] { "/LibraryClass" };\r
@@ -610,8 +611,10 @@ public class SurfaceAreaQuery {
         List<String> libraryClassName = new ArrayList<String>();\r
         for (int i = 0; i < libraryClassList.length; i++) {\r
                        List archList = libraryClassList[i].getSupArchList();\r
-\r
-                       if (arch == null || contains(archList, arch)) {\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
                 libraryClassName.add(libraryClassList[i].getKeyword());\r
                        }\r
         }\r
@@ -2008,15 +2011,8 @@ public class SurfaceAreaQuery {
                if (list == null || list.size()== 0) {\r
                        return true;\r
                }\r
-        Iterator it = list.iterator();\r
-        while (it.hasNext()) {\r
-            String s = (String)it.next();\r
-            if (s.equalsIgnoreCase(str)) {\r
-                return true;\r
-            }\r
-        }\r
 \r
-        return false;\r
+        return list.contains(str);\r
     }\r
 \r
        public boolean isHaveTianoR8FlashMap(){\r