BaseTools: Fix the bug that incorrect size info in the Lib autogen

The case is a PCD used in one library only, and in DSC component
section the PCD value is override in one of module inf. Then it cause
the bug the PCD size in the Lib autogen use the PCD value in the DSC
PCD section, but not use the override value.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index d100648606..b27290989e 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1293,12 +1293,17 @@ class PlatformAutoGen(AutoGen):
             ShareFixedAtBuildPcdsSameValue = {}

             for Module in LibAuto._ReferenceModules:

                 for Pcd in Module.FixedAtBuildPcds + LibAuto.FixedAtBuildPcds:

+                    DefaultValue = Pcd.DefaultValue

+                    # Cover the case: DSC component override the Pcd value and the Pcd only used in one Lib

+                    if Pcd in Module.LibraryPcdList:

+                        Index = Module.LibraryPcdList.index(Pcd)

+                        DefaultValue = Module.LibraryPcdList[Index].DefaultValue

                     key = ".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName))

                     if key not in FixedAtBuildPcds:

                         ShareFixedAtBuildPcdsSameValue[key] = True

-                        FixedAtBuildPcds[key] = Pcd.DefaultValue

+                        FixedAtBuildPcds[key] = DefaultValue

                     else:

-                        if FixedAtBuildPcds[key] != Pcd.DefaultValue:

+                        if FixedAtBuildPcds[key] != DefaultValue:

                             ShareFixedAtBuildPcdsSameValue[key] = False

             for Pcd in LibAuto.FixedAtBuildPcds:

                 key = ".".join((Pcd.TokenSpaceGuidCName, Pcd.TokenCName))