BaseTools: Optimize string concatenation

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / InfBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index c606b1a404d50150533ed0ae81b706fa9161da2d..99bbecfd1f8779bfabf1104dd8cc3d28d7d31a01 100644 (file)
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
+from __future__ import absolute_import\r
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.caching import cached_property, cached_class_function\r
@@ -613,7 +614,9 @@ class InfBuildData(ModuleBuildClassObject):
             Instance = Record[1]\r
             if Instance:\r
                 Instance = NormPath(Instance, self._Macros)\r
-            RetVal[Lib] = Instance\r
+                RetVal[Lib] = Instance\r
+            else:\r
+                RetVal[Lib] = None\r
         return RetVal\r
 \r
     ## Retrieve library names (for Edk.x style of modules)\r
@@ -791,6 +794,15 @@ class InfBuildData(ModuleBuildClassObject):
         RetVal.update(self._GetPcd(MODEL_PCD_DYNAMIC_EX))\r
         return RetVal\r
 \r
+    @cached_property\r
+    def PcdsName(self):\r
+        PcdsName = set()\r
+        for Type in (MODEL_PCD_FIXED_AT_BUILD,MODEL_PCD_PATCHABLE_IN_MODULE,MODEL_PCD_FEATURE_FLAG,MODEL_PCD_DYNAMIC,MODEL_PCD_DYNAMIC_EX):\r
+            RecordList = self._RawData[Type, self._Arch, self._Platform]\r
+            for TokenSpaceGuid, PcdCName, _, _, _, _, _ in RecordList:\r
+                PcdsName.add((PcdCName, TokenSpaceGuid))\r
+        return PcdsName\r
+\r
     ## Retrieve build options specific to this module\r
     @cached_property\r
     def BuildOptions(self):\r