From 3f7cb70c5a38609cbef2957fccbdf5d6f6a5555b Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Thu, 27 Dec 2018 16:09:53 +0800 Subject: [PATCH] BaseTools: Make sure AllPcdList valid. This patch is to make sure the AllPcdList is always evaluated. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bob Feng Cc: Liming Gao Tested-by: Laszlo Ersek Tested-by: Ard Biesheuvel Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/AutoGen.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 00ed804e62..f9ce17cf77 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1144,7 +1144,6 @@ class PlatformAutoGen(AutoGen): self.SourceOverrideDir = None self.FdTargetList = self.Workspace.FdTargetList self.FvTargetList = self.Workspace.FvTargetList - self.AllPcdList = [] # get the original module/package/platform objects self.BuildDatabase = Workspace.BuildDatabase self.DscBuildDataObj = Workspace.Platform @@ -1225,6 +1224,9 @@ class PlatformAutoGen(AutoGen): self.IsMakeFileCreated = True + @property + def AllPcdList(self): + return self.DynamicPcdList + self.NonDynamicPcdList ## Deal with Shared FixedAtBuild Pcds # def CollectFixedAtBuildPcds(self): @@ -1739,7 +1741,6 @@ class PlatformAutoGen(AutoGen): pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList[TAB_DEFAULT]) pcd.SkuInfoList[SkuName].SkuId = SkuId pcd.SkuInfoList[SkuName].SkuIdName = SkuName - self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList def FixVpdOffset(self, VpdFile ): FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY) -- 2.39.2