Removed the workaround code

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

1 files changed, 2 insertions, 6 deletions

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
index 8fb1be5cbe..4cf8c3caf2 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -226,15 +226,11 @@ public class AutogenLibOrder {
             if (libInstanceConsumedBy.get(libInstanceList[i]).size() > 0 && libInstanceList[i].hasConstructor()) {

                 EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName()

                            + " with constructor has a circular dependency!");

-                // throw new AutoGenException("Circular dependency in library instances is found!");

+                throw new AutoGenException("Circular dependency in library instances is found!");

             }

 

             if (!orderList.contains(libInstanceList[i])) {

-                if (libInstanceList[i].getName().equals("UefiBootServicesTableLib")) {

-                    orderList.addFirst(libInstanceList[i]);

-                } else {

-                    orderList.add(libInstanceList[i]);

-                }

+                orderList.add(libInstanceList[i]);

             }

         }

         return orderList;