Removed the workaround code

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

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 8fb1be5cbea9cfa233210e514af164b117b4ed7a..4cf8c3caf250949c51720b9a7b2a2d46507f6a5a 100644 (file)
--- 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()) {\r
                 EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName()\r
                            + " with constructor has a circular dependency!");\r
             if (libInstanceConsumedBy.get(libInstanceList[i]).size() > 0 && libInstanceList[i].hasConstructor()) {\r
                 EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName()\r
                            + " with constructor has a circular dependency!");\r

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

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

-                if (libInstanceList[i].getName().equals("UefiBootServicesTableLib")) {\r
-                    orderList.addFirst(libInstanceList[i]);\r
-                } else {\r
-                    orderList.add(libInstanceList[i]);\r
-                }\r
+                orderList.add(libInstanceList[i]);\r

             }\r
         }\r
         return orderList;\r
             }\r
         }\r
         return orderList;\r