This reverts commit 039bdb4d3e96f9c9264abf135b8a0eef2e2b4860 for tag20220=
8.
This brings the behavior changes, and needs more discussion.
Signed-off-by: Liming Gao <gaoliming@...>
Cc: Yuwei Chen <yuwei.chen@...>
Cc: Bob Feng <bob.c.feng@...>
---
BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTool=
s/Source/Python/Workspace/DscBuildData.py
index 41f93c93f2..e9f68384b4 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -872,7 +872,7 @@ class DscBuildData(PlatformBuildClassObject):
if ModuleType !=3D TAB_COMMON and ModuleType not in SUP_=
MODULE_LIST:
EdkLogger.error('build', OPTION_UNKNOWN, "Unknown mo=
dule type [%s]" % ModuleType,
File=3Dself.MetaFile, ExtraData=3DLi=
braryInstance, Line=3DLineNo)
- LibraryClassDict[ModuleType, Arch, LibraryClass] =3D Lib=
raryInstance
+ LibraryClassDict[Arch, ModuleType, LibraryClass] =3D Lib=
raryInstance
if LibraryInstance not in self._LibraryInstances:
self._LibraryInstances.append(LibraryInstance)
=20
@@ -881,7 +881,7 @@ class DscBuildData(PlatformBuildClassObject):
for LibraryClass in LibraryClassSet:
# try all possible module types
for ModuleType in SUP_MODULE_LIST:
- LibraryInstance =3D LibraryClassDict[ModuleType, sel=
f._Arch, LibraryClass]
+ LibraryInstance =3D LibraryClassDict[self._Arch, Mod=
uleType, LibraryClass]
if LibraryInstance is None:
continue
self._LibraryClasses[LibraryClass, ModuleType] =3D L=
ibraryInstance
--=20
2.27.0.windows.1
