diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
index a2f22c1b0b..286933f8ca 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserForThread.java
@@ -330,6 +330,11 @@ public class FpdParserForThread extends FpdParserTask {
                 allThreads.put(libFpdModuleId, liBuildThread);
                 
                 updateFvs("libqueue", libFpdModuleId);
+                
+                saq.push(GlobalData.getDoc(libinstances[i], fpdModuleId.getArch()));
+                GlobalData.addMsaBuildOption(libinstances[i], parseMsaBuildOptions(false));
+                GlobalData.addMsaFamilyBuildOption(libinstances[i], parseMsaBuildOptions(true));
+                saq.pop();
             }
             
             genBuildThread.setDependencies(dependencies);