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

2 files changed, 1 insertions, 37 deletions

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 4a47a9fb2f..dea679b407 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -79,11 +79,6 @@ public class AutoGen {
     private CommonDefinition.PCD_DRIVER_TYPE pcdDriverType;

 

     ///

-    /// Judge whether this module's library instance use PcdLib library class 

-    /// 

-    private boolean isModuleLibraryInstanceUsePcd;

-

-    ///

     /// The protocl list which records in module or library surface area and

     /// it's dependence on library instance surface area.

     ///

@@ -328,28 +323,6 @@ public class AutoGen {
         //

         String[] libClassList = SurfaceAreaQuery

                                 .getLibraryClasses(CommonDefinition.AlwaysConsumed,this.arch);

-        boolean  isModuleConsumePcdLib = false;

-        List<String> libClassArray     = new ArrayList<String>();

-        for (int index = 0; index < libClassList.length; index++) {

-            libClassArray.add(libClassList[index]);

-            //

-            // Search all library class of a module for PcdLib

-            // 

-            if (libClassList[index].equalsIgnoreCase(CommonDefinition.pcdLibName)) {

-                isModuleConsumePcdLib = true;

-            }

-        }

-

-        //

-        // If module do not use PCD but module's library use PCD.

-        // 

-        if (!isModuleConsumePcdLib && this.isModuleLibraryInstanceUsePcd) {

-            libClassArray.add(CommonDefinition.pcdLibName);

-        }

-

-        libClassList = new String[libClassArray.size()];

-        libClassArray.toArray(libClassList);

-

         if (libClassList != null) {

             libClassIncludeH = LibraryClassToAutogenH(libClassList);

             item = libClassIncludeH.iterator();

@@ -2085,9 +2058,6 @@ public class AutoGen {
                                                       .getProtocolNotifyArray(this.arch);

                         String[] guidList = SurfaceAreaQuery

                                             .getGuidEntryArray(this.arch);

-                        String[] libraryClassList = SurfaceAreaQuery.getLibraryClasses(

-                                                        CommonDefinition.AlwaysConsumed, 

-                                                        this.arch);

                         PackageIdentification[] pkgList = SurfaceAreaQuery.getDependencePkg(this.arch);

 

                         //

@@ -2119,11 +2089,7 @@ public class AutoGen {
                                 this.mDepPkgList.add(pkgList[index]);

                             }

                         }

-                        for (index = 0; index < libraryClassList.length; index++) {

-                            if (libraryClassList[index].equalsIgnoreCase(CommonDefinition.pcdLibName)) {

-                                this.isModuleLibraryInstanceUsePcd = true;

-                            }

-                        }

+

                         //

                         // If not yet parse this library instance's constructor

                         // element,parse it.

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
index 244f2550b5..a99de4da4f 100644
--- 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";

     public final static String flashMapH = "FlashMap.h";

 

-    public final static String pcdLibName = "PcdLib";

-

     //

     // The defintions for identifying current module

     // is PEI Pcd driver or Dxe Pcd driver.