Restrict using UserExtension with UserID "TianoCore".

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 39384c45ba1d58cd9212eeca6c0d797b9048f0b3..2d8abc3b1c71f698bba164311823df826456ef85 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -23,7 +23,6 @@ import java.util.Stack;
 import java.util.regex.Matcher;\r
 import java.util.regex.Pattern;\r
 \r
-import org.apache.xmlbeans.XmlCursor;\r
 import org.apache.xmlbeans.XmlObject;\r
 import org.apache.xmlbeans.XmlString;\r
 import org.tianocore.BuildOptionsDocument;\r
@@ -1379,10 +1378,10 @@ public class SurfaceAreaQuery {
     }\r
     \r
     public static Node getFpdUserExtension() {\r
-        String[] xPath = new String[] { "/UserExtensions" };\r
+        String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore']" }; \r
 \r
         Object[] queryResult = get("PlatformSurfaceArea", xPath);\r
-        if (queryResult == null && queryResult.length == 0) {\r
+        if (queryResult == null || queryResult.length == 0) {\r
             return null;\r
         }\r
         UserExtensionsDocument.UserExtensions a =  (UserExtensionsDocument.UserExtensions)queryResult[0];\r