import java.util.Map;\r
\r
import org.apache.xmlbeans.XmlObject;\r
-import org.tianocore.LibraryClassDocument.LibraryClass;\r
\r
import org.tianocore.build.global.GlobalData;\r
import org.tianocore.build.global.SurfaceAreaQuery;\r
// libInstanceMap.\r
//\r
libClassConsmList = SurfaceAreaQuery\r
- .getLibraryClasses(CommonDefinition.AlwaysConsumed);\r
+ .getLibraryClasses(CommonDefinition.AlwaysConsumed, arch);\r
if (libClassConsmList != null) {\r
String[] classStr = new String[libClassConsmList.length];\r
for (int k = 0; k < libClassConsmList.length; k++) {\r
if (this.libInstanceMap.containsKey(libraryList[i])) {\r
throw new Exception(\r
libraryList[i].getName()\r
- + "this library instance is already exist, please check you library instance list!");\r
+ + "this library instance already exists, please check the library instance list!");\r
} else {\r
this.libInstanceMap.put(libraryList[i], classStr);\r
}\r
// Add library class and library instance map.\r
//\r
libClassDeclList = SurfaceAreaQuery\r
- .getLibraryClasses(CommonDefinition.AlwaysProduced);\r
+ .getLibraryClasses(CommonDefinition.AlwaysProduced, arch);\r
if (libClassDeclList != null) {\r
for (int j = 0; j < libClassDeclList.length; j++) {\r
if (this.libClassMap.containsKey(libClassDeclList[j])) {\r
System.out.println(libClassDeclList[j]\r
+ " class is already implement by "\r
+ this.libClassMap.get(libClassDeclList[j]));\r
- throw new Exception(libClassDeclList\r
- + " is already have library instance!");\r
+ throw new Exception("Library Class: " + libClassDeclList\r
+ + " already has a library instance!");\r
} else {\r
this.libClassMap.put(libClassDeclList[j], libraryList[i]);\r
}\r