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=6afeb30f5a5b5b8251e037f6c7cc41eede187556;hp=0140e8b704614bee058546f39c659935760ae256;hb=91a1f0d7ac1e62fb578d645c546c9c12e81f5fe2;hpb=feccee87a78e68d575dbdf44b34ca0cb5a21ea8d

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 0140e8b704..6afeb30f5a 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -38,7 +38,6 @@ import org.tianocore.build.id.PackageIdentification;
 import org.tianocore.build.id.PlatformIdentification;
 import org.tianocore.build.toolchain.ToolChainInfo;
 import org.tianocore.common.exception.EdkException;
-import org.tianocore.common.logger.EdkLog;
 import org.w3c.dom.Node;
 
 /**
@@ -249,22 +248,32 @@ public class SurfaceAreaQuery {
         returns = get("SourceFiles", xPath);
 
         if (returns == null || returns.length == 0) {
-            return new String[0][0];
+            return new String[0][3];
         }
 
         Filename[] sourceFileNames = (Filename[]) returns;
         List<String[]> outputList = new ArrayList<String[]>();
         for (int i = 0; i < sourceFileNames.length; i++) {
             List archList = sourceFileNames[i].getSupArchList();
-            if (arch == null || arch.equalsIgnoreCase("") || archList == null || contains(archList, arch)) {
-                outputList.add(new String[] {sourceFileNames[i].getToolCode(),sourceFileNames[i].getStringValue()});
+            if (arch == null || arch.trim().equalsIgnoreCase("") || archList == null || contains(archList, arch)) {
+                outputList.add(new String[] {sourceFileNames[i].getToolCode(), sourceFileNames[i].getStringValue(), sourceFileNames[i].getToolChainFamily()});
             }
         }
 
-        String[][] outputString = new String[outputList.size()][2];
+        String[][] outputString = new String[outputList.size()][3];
         for (int index = 0; index < outputList.size(); index++) {
+            //
+            // ToolCode (FileType)
+            //
             outputString[index][0] = outputList.get(index)[0];
+            //
+            // File name (relative to MODULE_DIR)
+            //
             outputString[index][1] = outputList.get(index)[1];
+            //
+            // Tool chain family
+            //
+            outputString[index][2] = outputList.get(index)[2];
         }
         return outputString;
     }
@@ -1828,9 +1837,6 @@ public class SurfaceAreaQuery {
             guidPair[0] = entry.getCName();
             guidPair[1] = entry.getGuidValue();
             guidDeclMap.put(entry.getCName(), guidPair);
-            EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());
-            EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[0]);
-            EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[1]);
         }
         return guidDeclMap;
     }
@@ -1859,9 +1865,6 @@ public class SurfaceAreaQuery {
             protocolPair[0] = entry.getCName();
             protocolPair[1] = entry.getGuidValue();
             protoclMap.put(entry.getCName(), protocolPair);
-            EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());
-            EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[0]);
-            EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[1]);
         }
         return protoclMap;
     }