Sync BaseTool trunk (version r2670) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Xml / ModuleSurfaceAreaXml.py

diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index a913a859f62e9a3faed1df3e55f7d90d8e0accf7..9e141cabb4c4b1b4c53d949d492d22bd29336d30 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -1,7 +1,7 @@
 ## @file\r
 # This file is used to parse a Module file of .PKG file\r
 #\r
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -20,6 +20,7 @@ from xml.dom import minidom
 from Library.String import ConvertNEToNOTEQ\r
 from Library.String import ConvertNOTEQToNE\r
 from Library.String import GetStringOfList\r
+from Library.String import IsMatchArch\r
 from Library.Xml.XmlRoutines import XmlElement\r
 from Library.Xml.XmlRoutines import XmlAttribute\r
 from Library.Xml.XmlRoutines import XmlNode\r
@@ -128,9 +129,11 @@ class BinaryFileXml(object):
             pass\r
         NodeList = []\r
         FilenameList = BinaryFile.GetFileNameList()\r
+        SupportArch = None\r
         for Filename in FilenameList:\r
             Tmp = FilenameXml()\r
             NodeList.append(Tmp.ToXml(Filename, 'Filename'))\r
+            SupportArch = Filename.SupArchList\r
 \r
         if GlobalData.gIS_BINARY_INF:\r
             AsBuildList = BinaryFile.GetAsBuiltList()\r
@@ -142,12 +145,14 @@ class BinaryFileXml(object):
             AsBuiltNodeList = []\r
 \r
             for Pcd in PatchPcdValueList:\r
-                Tmp = PcdEntryXml()\r
-                AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PatchPcdValue'))\r
+                if IsMatchArch(Pcd.SupArchList, SupportArch):\r
+                    Tmp = PcdEntryXml()\r
+                    AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PatchPcdValue'))\r
 \r
             for Pcd in PcdExList:\r
-                Tmp = PcdEntryXml()\r
-                AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PcdExValue'))\r
+                if IsMatchArch(Pcd.SupArchList, SupportArch):\r
+                    Tmp = PcdEntryXml()\r
+                    AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PcdExValue'))\r
 \r
             GuiVerElemList = []\r
             for LibGuidVer in LibGuidVerList:\r