mirror of https://github.com/acidanthera/audk.git
Fix EDKT117. If SupArchList is not specified, then build the module with all current toolchain supported ARCHs.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1001 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
70edbc34be
commit
ae20899810
|
@ -41,7 +41,6 @@ import org.tianocore.build.id.ModuleIdentification;
|
|||
import org.tianocore.build.id.PlatformIdentification;
|
||||
import org.tianocore.build.pcd.action.ActionMessage;
|
||||
import org.tianocore.build.pcd.action.CollectPCDAction;
|
||||
import org.tianocore.build.pcd.exception.EntityException;
|
||||
import org.tianocore.build.toolchain.ToolChainAttribute;
|
||||
import org.tianocore.build.toolchain.ToolChainElement;
|
||||
import org.tianocore.build.toolchain.ToolChainMap;
|
||||
|
|
|
@ -1316,7 +1316,9 @@ public class SurfaceAreaQuery {
|
|||
//
|
||||
// Get Fpd SA Module attribute and create FpdMoudleIdentification.
|
||||
//
|
||||
arch = moduleSA.getSupArchList().toString();
|
||||
if (moduleSA.getSupArchList() != null) {
|
||||
arch = moduleSA.getSupArchList().toString();
|
||||
}
|
||||
|
||||
// TBD
|
||||
fvBinding = null;
|
||||
|
@ -1342,21 +1344,25 @@ public class SurfaceAreaQuery {
|
|||
// Create FpdModule Identification which have class member of module
|
||||
// identification
|
||||
//
|
||||
if (arch != null) {
|
||||
String[] archList = arch.split(" ");
|
||||
for (int j = 0; j < archList.length; j++) {
|
||||
FpdModuleIdentification fpdSaId = new FpdModuleIdentification(saId, archList[j]);
|
||||
String[] archList = new String[0];
|
||||
if (arch == null || arch.trim().length() == 0) {
|
||||
archList = GlobalData.getToolChainInfo().getArchs();
|
||||
}
|
||||
else{
|
||||
archList = arch.split(" ");
|
||||
}
|
||||
for (int j = 0; j < archList.length; j++) {
|
||||
FpdModuleIdentification fpdSaId = new FpdModuleIdentification(saId, archList[j]);
|
||||
|
||||
if (fvBinding != null) {
|
||||
fpdSaId.setFvBinding(fvBinding);
|
||||
}
|
||||
|
||||
//
|
||||
// Put element to Map<FpdModuleIdentification, Map<String,
|
||||
// Object>>.
|
||||
//
|
||||
fpdModuleMap.put(fpdSaId, ObjectMap);
|
||||
if (fvBinding != null) {
|
||||
fpdSaId.setFvBinding(fvBinding);
|
||||
}
|
||||
|
||||
//
|
||||
// Put element to Map<FpdModuleIdentification, Map<String,
|
||||
// Object>>.
|
||||
//
|
||||
fpdModuleMap.put(fpdSaId, ObjectMap);
|
||||
}
|
||||
}
|
||||
return fpdModuleMap;
|
||||
|
|
Loading…
Reference in New Issue