Added a workaround to fix the library instance constructor sequence issue.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2221 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 11469a6c49c13194e13e57c64d932f054a5457dd..8fb1be5cbea9cfa233210e514af164b117b4ed7a 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -223,8 +223,18 @@ public class AutogenLibOrder {
         // Append the remaining library instance to the end of sorted list\r
         // \r
         for (int i = 0; i < libInstanceList.length; ++i) {\r
         // Append the remaining library instance to the end of sorted list\r
         // \r
         for (int i = 0; i < libInstanceList.length; ++i) {\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
+            }\r
+\r

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

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

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