tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
klu2 2006-08-17 16:23:46 +00:00
parent 515bd5d42f
commit ca844f3623
4 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
View File

@ -41,9 +41,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiDriverEntryPoint</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>PcdLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>BaseLib</Keyword>
</LibraryClass>

3
MdePkg/Library/BasePeCoffLib/BasePeCoffLib.msa
View File

@ -31,9 +31,6 @@
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>DebugLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>PcdLib</Keyword>
</LibraryClass>
</LibraryClassDefinitions>
<SourceFiles>
<Filename>BasePeCoff.c</Filename>

36
Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
View File

@ -78,11 +78,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.

2
Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
View File

@ -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.