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

Fixed the fake circular denpendency of library instance. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2285 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2007-01-23 09:48:03 +00:00
parent 8c8a13bf5c
commit 9d3d149f81
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
View File

@ -91,7 +91,7 @@ public class AutogenLibOrder {
// Create library class consume database.
//
libClassConsmList = saq.getLibraryClasses(CommonDefinition.ALWAYSCONSUMED, arch, null);
if (libClassConsmList.length > 0) {
if (libClassConsmList != null) {
if (this.libInstanceConsumes.containsKey(libInstance)) {
throw new AutoGenException(
libraryList[i].getName()
@ -105,7 +105,7 @@ public class AutogenLibOrder {
// Create library class implementer database
//
libClassDeclList = saq.getLibraryClasses(CommonDefinition.ALWAYSPRODUCED, arch, null);
if (libClassDeclList.length > 0) {
if (libClassDeclList != null) {
this.libInstanceProduces.put(libInstance, libClassDeclList);
for (int j = 0; j < libClassDeclList.length; j++) {
if (this.libClassProducer.containsKey(libClassDeclList[j])) {
@ -132,9 +132,6 @@ public class AutogenLibOrder {
for (int k = 0; k < libraryList.length; ++k) {
ModuleIdentification consumer = libraryList[k];
String[] consumedClassList = libInstanceConsumes.get(consumer);
if (consumedClassList == null) {
continue;
}
for (int l = 0; l < consumedClassList.length; ++l) {
if (consumedClassList[l].equals(className)) {
@ -171,9 +168,6 @@ public class AutogenLibOrder {
orderList.addFirst(n);
String[] consumedClassList = libInstanceConsumes.get(n);
if (consumedClassList == null) {
continue;
}
for (int i = 0; i < consumedClassList.length; ++i) {
ModuleIdentification m = libClassProducer.get(consumedClassList[i]);
if (m == null) {