CorebootPayloadPkg: Conditionally add DebugAgentLib for DXE drivers

[mirror_edk2.git] / BaseTools / Source / Python / UPT / PomAdapter / InfPomAlignment.py

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index fa5f5af0e2126e74bc795f2dd5425e63564900e9..a15173285345074de96700b27e7f72fae1eeb5c9 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -51,7 +51,7 @@ from PomAdapter.InfPomAlignmentMisc import GenModuleHeaderUserExt
 from PomAdapter.InfPomAlignmentMisc import GenBinaryData\r
 from Parser import InfParser\r
 from PomAdapter.DecPomAlignment import DecPomAlignment\r
-\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 ## InfPomAlignment\r
 #\r
@@ -534,8 +534,7 @@ class InfPomAlignment(ModuleObject):
             PackageDependency.SetSupArchList(ConvertArchList(PackageItemObj.GetSupArchList()))\r
             PackageDependency.SetFeatureFlag(PackageItemObj.GetFeatureFlagExp())\r
 \r
-            PkgInfo = GetPkgInfoFromDec(os.path.normpath(os.path.join(self.WorkSpace,\r
-                                                                      NormPath(PackageItemObj.GetPackageName()))))\r
+            PkgInfo = GetPkgInfoFromDec(mws.join(self.WorkSpace, NormPath(PackageItemObj.GetPackageName())))\r
             if PkgInfo[1] and PkgInfo[2]:\r
                 PackageDependency.SetGuid(PkgInfo[1])\r
                 PackageDependency.SetVersion(PkgInfo[2])\r
@@ -940,7 +939,7 @@ class InfPomAlignment(ModuleObject):
                     HelpTextObj.SetString(CommentItem.GetHelpStringItem())\r
                     Pcd.SetHelpTextList(Pcd.GetHelpTextList() + [HelpTextObj])\r
                 AsBuildPatchPcdList.append(Pcd)\r
-            else:\r
+            elif PcdItem[0].upper() == DT.TAB_INF_PCD_EX.upper():\r
                 PcdItemObj = PcdItem[1]\r
                 Pcd = CommonObject.PcdObject()\r
                 Pcd.SetTokenSpaceGuidValue(PcdItemObj.GetTokenSpaceGuidValue())\r