BaseTools: Share a dictionary instead of keeping multiples

[mirror_edk2.git] / BaseTools / Source / Python / build / BuildReport.py

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index b2e5fd6fbf384dc049e7ef543368f32abfa4cb6c..b25350e4bf9d4e3533ea679d2ac10bc29014f3c3 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -47,21 +47,6 @@ from Common.DataType import *
 import collections\r
 from Common.Expression import *\r
 \r
-gComponentType2ModuleType = {\r
-    "LIBRARY"               :   SUP_MODULE_BASE,\r
-    "SECURITY_CORE"         :   SUP_MODULE_SEC,\r
-    SUP_MODULE_PEI_CORE     :   SUP_MODULE_PEI_CORE,\r
-    "COMBINED_PEIM_DRIVER"  :   SUP_MODULE_PEIM,\r
-    "PIC_PEIM"              :   SUP_MODULE_PEIM,\r
-    "RELOCATABLE_PEIM"      :   SUP_MODULE_PEIM,\r
-    "PE32_PEIM"             :   SUP_MODULE_PEIM,\r
-    "BS_DRIVER"             :   SUP_MODULE_DXE_DRIVER,\r
-    "RT_DRIVER"             :   SUP_MODULE_DXE_RUNTIME_DRIVER,\r
-    "SAL_RT_DRIVER"         :   SUP_MODULE_DXE_SAL_DRIVER,\r
-    "APPLICATION"           :   SUP_MODULE_UEFI_APPLICATION,\r
-    "LOGO"                  :   SUP_MODULE_BASE,\r
-}\r
-\r
 ## Pattern to extract contents in EDK DXS files\r
 gDxsDependencyPattern = re.compile(r"DEPENDENCY_START(.+)DEPENDENCY_END", re.DOTALL)\r
 \r
@@ -422,7 +407,7 @@ class DepexReport(object):
         self._DepexFileName = os.path.join(M.BuildDir, "OUTPUT", M.Module.BaseName + ".depex")\r
         ModuleType = M.ModuleType\r
         if not ModuleType:\r
-            ModuleType = gComponentType2ModuleType.get(M.ComponentType, "")\r
+            ModuleType = COMPONENT_TO_MODULE_MAP_DICT.get(M.ComponentType, "")\r
 \r
         if ModuleType in [SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_DXE_CORE, SUP_MODULE_SMM_CORE, SUP_MODULE_MM_CORE_STANDALONE, SUP_MODULE_UEFI_APPLICATION]:\r
             return\r
@@ -587,7 +572,7 @@ class ModuleReport(object):
         if not M.IsLibrary:\r
             ModuleType = M.ModuleType\r
             if not ModuleType:\r
-                ModuleType = gComponentType2ModuleType.get(M.ComponentType, "")\r
+                ModuleType = COMPONENT_TO_MODULE_MAP_DICT.get(M.ComponentType, "")\r
             #\r
             # If a module complies to PI 1.1, promote Module type to "SMM_DRIVER"\r
             #\r