Sync BaseTools Trunk (version r2524) to EDKII main trunk.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liu Yingke <yingke.d.liu@intel.com>
Reviewed-by: Yurui Zeng <yurui.zeng@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13353 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/Python/AutoGen/AutoGen.py

@@ -292,12 +292,12 @@ class WorkspaceAutoGen(AutoGen):
         for Arch in self.ArchList:
             Platform = self.BuildDatabase[self.MetaFile, Arch, Target, Toolchain]
 
-            DecPcds = set()
+            DecPcds = {}
             PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)
             Pkgs = PGen.PackageList
             for Pkg in Pkgs:
-                for Pcd in Pkg.Pcds.keys():
-                    DecPcds.add((Pcd[0], Pcd[1]))
+                for Pcd in Pkg.Pcds:
+                    DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd]
             Platform.IsPlatformPcdDeclared(DecPcds)
 
             Platform.SkuName = self.SkuId