Changed the way of handling not supported ARCH for a module. It should not break...

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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 28bfb9efb51b3f5aeaf0c19facf339ba4f11d7ff..3c21c401848cede6ea22c950bfbae1ee8821fbfb 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -252,8 +252,9 @@ public class GenBuildTask extends Ant {
         List moduleSupportedArchs = saq.getModuleSupportedArchs();\r
         if (moduleSupportedArchs != null) {\r
             for (int k = 0; k < archList.length; k++) {\r
         List moduleSupportedArchs = saq.getModuleSupportedArchs();\r
         if (moduleSupportedArchs != null) {\r
             for (int k = 0; k < archList.length; k++) {\r

-                if ( ! moduleSupportedArchs.contains(archList[k])) {\r
-                    throw new BuildException("Specified architecture [" + archList[k] + "] is not supported by " + moduleId + ". The module " + moduleId + " only supports [" + moduleSupportedArchs + "] architectures.");\r
+                if (!moduleSupportedArchs.contains(archList[k])) {\r
+                    EdkLog.log(this, EdkLog.EDK_WARNING, "Specified architecture [" + archList[k] + "] is not supported by " + moduleId + ". The module " + moduleId + " only supports [" + moduleSupportedArchs + "] architectures.");\r
+                    archList[k] = "";\r

                 }\r
             }\r
         }\r
                 }\r
             }\r
         }\r


@@ -263,6 +264,9 @@ public class GenBuildTask extends Ant {
         }\r
 \r
         for (int k = 0; k < archList.length; k++) {\r
         }\r
 \r
         for (int k = 0; k < archList.length; k++) {\r

+            if (archList[k] == "") {\r
+                continue;\r
+            }\r

 \r
             getProject().setProperty("ARCH", archList[k]);\r
 \r
 \r
             getProject().setProperty("ARCH", archList[k]);\r
 \r