added the support for new schema and old schema at the same time

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / GenBuildTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 2d3318d551bceae007e592ababd5a2cdec96b55d..5ee07fb34edc84643d82140139892dcae317f77e 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -1063,10 +1063,13 @@ public class GenBuildTask extends Task {
         getProject().setProperty("SDB_FILES", "");\r
         getProject().setProperty("BASE_NAME", baseName);\r
         if (map.get("MsaHeader") != null) {\r
-            flag = GlobalData.MSA_AND_MBD;\r
-            MsaHeaderDocument.MsaHeader header = ((MsaHeaderDocument) map.get("MsaHeader")).getMsaHeader();\r
-            guid = header.getGuid().getStringValue();\r
-            componentType = header.getComponentType().toString();\r
+            guid = SurfaceAreaQuery.getModuleGuid();//header.getGuid().getStringValue();\r
+            componentType = SurfaceAreaQuery.getComponentType();//header.getComponentType().toString();\r
+            if (!componentType.equalsIgnoreCase("LIBRARY")) {\r
+                flag = GlobalData.MSA_AND_MBD;\r
+            } else {\r
+                flag = GlobalData.LIBMSA_AND_LIBMBD;\r
+            }\r
         } \r
         \r
         else if (map.get("MsaLibHeader") != null) {\r
@@ -1080,7 +1083,7 @@ public class GenBuildTask extends Task {
         if (componentType != null) {\r
             getProject().setProperty("COMPONENT_TYPE", componentType);\r
         }\r
-        \r
+\r
         if (guid != null) {\r
             getProject().setProperty("FILE_GUID", guid);\r
         }\r