Revert "BaseTools: Fix DSC LibraryClass precedence rule"

This reverts commit 039bdb4d3e96f9c9264abf135b8a0eef2e2b4860 for tag202208.
This brings the behavior changes, and needs more discussion.

Signed-off-by: Liming Gao <gaoliming@byosoft.com.cn>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/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 != TAB_COMMON and ModuleType not in SUP_MODULE_LIST:

                     EdkLogger.error('build', OPTION_UNKNOWN, "Unknown module type [%s]" % ModuleType,

                                     File=self.MetaFile, ExtraData=LibraryInstance, Line=LineNo)

-                LibraryClassDict[ModuleType, Arch, LibraryClass] = LibraryInstance

+                LibraryClassDict[Arch, ModuleType, LibraryClass] = LibraryInstance

                 if LibraryInstance not in self._LibraryInstances:

                     self._LibraryInstances.append(LibraryInstance)

 

@@ -881,7 +881,7 @@ class DscBuildData(PlatformBuildClassObject):
             for LibraryClass in LibraryClassSet:

                 # try all possible module types

                 for ModuleType in SUP_MODULE_LIST:

-                    LibraryInstance = LibraryClassDict[ModuleType, self._Arch, LibraryClass]

+                    LibraryInstance = LibraryClassDict[self._Arch, ModuleType, LibraryClass]

                     if LibraryInstance is None:

                         continue

                     self._LibraryClasses[LibraryClass, ModuleType] = LibraryInstance