X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFileContents.java;h=6e7c79f6582976223cc09d38f89c805a23833b0a;hp=0e1f4ccf89253fa75bd103c690d9dfbf7572c1c9;hb=8f55ea7396747725b18b8090f9d3fc5c22d1c53f;hpb=7cae34b00a5a1168dfccaeb9a92721735c56bb6c

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 0e1f4ccf89..6e7c79f658 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -40,6 +40,7 @@ import org.tianocore.FrameworkModulesDocument;
 import org.tianocore.IntermediateOutputType;
 import org.tianocore.LibrariesDocument;
 import org.tianocore.ModuleSADocument;
+import org.tianocore.ModuleSaBuildOptionsDocument;
 import org.tianocore.ModuleSurfaceAreaDocument;
 import org.tianocore.OptionDocument;
 import org.tianocore.OptionsDocument;
@@ -570,10 +571,21 @@ public class FpdFileContents {
             return;
         }
         if(msa.getModuleSaBuildOptions() == null){
-            msa.addNewModuleSaBuildOptions().setFfsFileNameGuid(fileGuid);
-            return;
+            msa.addNewModuleSaBuildOptions();
+            
+        }
+        ModuleSaBuildOptionsDocument.ModuleSaBuildOptions msaBuildOpts= msa.getModuleSaBuildOptions();
+        if (fileGuid != null) {
+            msaBuildOpts.setFfsFileNameGuid(fileGuid);
+        }
+        else{
+            XmlCursor cursor = msaBuildOpts.newCursor();
+            if (cursor.toChild(xmlNs, "FfsFileNameGuid")) {
+                cursor.removeXml();
+            }
+            cursor.dispose();
         }
-        msa.getModuleSaBuildOptions().setFfsFileNameGuid(fileGuid);
+        
     }
     
     public String getFfsFormatKey(String moduleKey){