From: Yonghong Zhu <yonghong.zhu@intel.com>
Date: Fri, 13 Jul 2018 08:07:06 +0000 (+0800)
Subject: BaseTools: Remove the duplicate Pcd items
X-Git-Tag: edk2-stable201903~1396
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=d900d7c9857a676d9271a0ab499c12b379dc3652;ds=sidebyside

BaseTools: Remove the duplicate Pcd items

The case is the Pcd item both used in 1 module inf and 1 lib inf, and
in the DSC component section, it override the Pcd value.
In the module, the pcd value is the override value, but in the lib inf
the pcd value is the value that in the DSC PCD section's value, then it
cause the Pcd value is different in the module and lib. but actually we
only need use the Pcd value in the module to decide whether it use the
same 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>
---

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index c5ab334459..a7af33d520 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1292,7 +1292,7 @@ class PlatformAutoGen(AutoGen):
             FixedAtBuildPcds = {}
             ShareFixedAtBuildPcdsSameValue = {}
             for Module in LibAuto._ReferenceModules:
-                for Pcd in Module.FixedAtBuildPcds + LibAuto.FixedAtBuildPcds:
+                for Pcd in set(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: