BaseTools: Structure Pcd value override incorrect.

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

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 3b47715cbc956091f8a03007928eb703d16baaf2..7e96370d955024a15144b3b12059e8cf1b9219e1 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -11,11 +11,6 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-import Common.LongFilePathOs as os\r
-\r
-from collections import OrderedDict\r
-from Common.Misc import RealPath2\r
-from Common.BuildToolError import *\r
 from Common.DataType import *\r
 import collections\r
 \r
@@ -66,7 +61,7 @@ class PcdClassObject(object):
         self.validlists = validlists\r
         self.expressions = expressions\r
         self.DscDefaultValue = None\r
-        self.DscRawValue = None\r
+        self.DscRawValue = {}\r
         if IsDsc:\r
             self.DscDefaultValue = Value\r
         self.PcdValueFromComm = ""\r
@@ -253,18 +248,14 @@ class StructurePcd(PcdClassObject):
 # @param object:      Inherited from object class\r
 # @param Name:        Input value for LibraryClassName, default is None\r
 # @param SupModList:  Input value for SupModList, default is []\r
-# @param Type:        Input value for Type, default is None\r
 #\r
 # @var LibraryClass:  To store value for LibraryClass\r
 # @var SupModList:    To store value for SupModList\r
-# @var Type:          To store value for Type\r
 #\r
 class LibraryClassObject(object):\r
-    def __init__(self, Name = None, SupModList = [], Type = None):\r
+    def __init__(self, Name = None, SupModList = []):\r
         self.LibraryClass = Name\r
         self.SupModList = SupModList\r
-        if Type is not None:\r
-            self.SupModList = CleanString(Type).split(DataType.TAB_SPACE_SPLIT)\r
 \r
 ## ModuleBuildClassObject\r
 #\r
@@ -332,7 +323,7 @@ class ModuleBuildClassObject(object):
 \r
         self.Binaries                = []\r
         self.Sources                 = []\r
-        self.LibraryClasses          = OrderedDict()\r
+        self.LibraryClasses          = collections.OrderedDict()\r
         self.Libraries               = []\r
         self.Protocols               = []\r
         self.Ppis                    = []\r