Continue to fix EDKT187.

After discussion with ouyang, qian and shi, carl, we find it is no necessary to add PcdLib according to whether library instance use PcdLib.
In this patch. I remove original fixing and correct some MSA file.

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

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index b13861eecf3aafccfe9dc6c3095f9ce064f51361..95045aa4be8b4cdafcfa5b353a8c373cf384f762 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -41,9 +41,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PcdLib</Keyword>\r
-    </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseLib</Keyword>\r
     </LibraryClass>\r

diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
index 6e4f9e0e36d13c005b02e96e7e142981f249e915..09698a48896d71942434fefd88a9c98452b055e9 100644 (file)
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
@@ -31,9 +31,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PcdLib</Keyword>\r
-    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>BasePeCoff.c</Filename>\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 4a47a9fb2f39103437da18173a9d86e210a538a3..dea679b407856861bb2cf034fb30bc943f4a95ac 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -78,11 +78,6 @@ public class AutoGen {
     /// \r
     private CommonDefinition.PCD_DRIVER_TYPE pcdDriverType;\r
 \r
-    ///\r
-    /// Judge whether this module's library instance use PcdLib library class \r
-    /// \r
-    private boolean isModuleLibraryInstanceUsePcd;\r
-\r
     ///\r
     /// The protocl list which records in module or library surface area and\r
     /// it's dependence on library instance surface area.\r
@@ -328,28 +323,6 @@ public class AutoGen {
         //\r
         String[] libClassList = SurfaceAreaQuery\r
                                 .getLibraryClasses(CommonDefinition.AlwaysConsumed,this.arch);\r
-        boolean  isModuleConsumePcdLib = false;\r
-        List<String> libClassArray     = new ArrayList<String>();\r
-        for (int index = 0; index < libClassList.length; index++) {\r
-            libClassArray.add(libClassList[index]);\r
-            //\r
-            // Search all library class of a module for PcdLib\r
-            // \r
-            if (libClassList[index].equalsIgnoreCase(CommonDefinition.pcdLibName)) {\r
-                isModuleConsumePcdLib = true;\r
-            }\r
-        }\r
-\r
-        //\r
-        // If module do not use PCD but module's library use PCD.\r
-        // \r
-        if (!isModuleConsumePcdLib && this.isModuleLibraryInstanceUsePcd) {\r
-            libClassArray.add(CommonDefinition.pcdLibName);\r
-        }\r
-\r
-        libClassList = new String[libClassArray.size()];\r
-        libClassArray.toArray(libClassList);\r
-\r
         if (libClassList != null) {\r
             libClassIncludeH = LibraryClassToAutogenH(libClassList);\r
             item = libClassIncludeH.iterator();\r
@@ -2085,9 +2058,6 @@ public class AutoGen {
                                                       .getProtocolNotifyArray(this.arch);\r
                         String[] guidList = SurfaceAreaQuery\r
                                             .getGuidEntryArray(this.arch);\r
-                        String[] libraryClassList = SurfaceAreaQuery.getLibraryClasses(\r
-                                                        CommonDefinition.AlwaysConsumed, \r
-                                                        this.arch);\r
                         PackageIdentification[] pkgList = SurfaceAreaQuery.getDependencePkg(this.arch);\r
 \r
                         //\r
@@ -2119,11 +2089,7 @@ public class AutoGen {
                                 this.mDepPkgList.add(pkgList[index]);\r
                             }\r
                         }\r
-                        for (index = 0; index < libraryClassList.length; index++) {\r
-                            if (libraryClassList[index].equalsIgnoreCase(CommonDefinition.pcdLibName)) {\r
-                                this.isModuleLibraryInstanceUsePcd = true;\r
-                            }\r
-                        }\r
+\r
                         //\r
                         // If not yet parse this library instance's constructor\r
                         // element,parse it.\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
index 244f2550b558009b7a01d53cc1af3608f317335a..a99de4da4f4c0a0fbc58462457e190eea93b488f 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
@@ -58,8 +58,6 @@ public class CommonDefinition {
     public final static String tianoR8FlashMapH = "TianoR8FlashMap.h";\r
     public final static String flashMapH = "FlashMap.h";\r
 \r
-    public final static String pcdLibName = "PcdLib";\r
-\r
     //\r
     // The defintions for identifying current module\r
     // is PEI Pcd driver or Dxe Pcd driver.\r