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>

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 41f93c93f2a743e7ee1dbd72bb687adb4748dd81..e9f68384b429727a27af0360a5c28baf54265010 100644 (file)
--- 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:\r
                     EdkLogger.error('build', OPTION_UNKNOWN, "Unknown module type [%s]" % ModuleType,\r
                                     File=self.MetaFile, ExtraData=LibraryInstance, Line=LineNo)\r
-                LibraryClassDict[ModuleType, Arch, LibraryClass] = LibraryInstance\r
+                LibraryClassDict[Arch, ModuleType, LibraryClass] = LibraryInstance\r
                 if LibraryInstance not in self._LibraryInstances:\r
                     self._LibraryInstances.append(LibraryInstance)\r
 \r
@@ -881,7 +881,7 @@ class DscBuildData(PlatformBuildClassObject):
             for LibraryClass in LibraryClassSet:\r
                 # try all possible module types\r
                 for ModuleType in SUP_MODULE_LIST:\r
-                    LibraryInstance = LibraryClassDict[ModuleType, self._Arch, LibraryClass]\r
+                    LibraryInstance = LibraryClassDict[self._Arch, ModuleType, LibraryClass]\r
                     if LibraryInstance is None:\r
                         continue\r
                     self._LibraryClasses[LibraryClass, ModuleType] = LibraryInstance\r