From: wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 17 Jul 2006 07:43:21 +0000 (+0000)
Subject: Fix EDKT138. And add active_platform file info for stand alone module build.
X-Git-Tag: edk2-stable201903~24836
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=fa2da5b1c1f8f4ff193c120acbd5412732a57342

Fix EDKT138. And add active_platform file info for stand alone module build.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 286fd69490..c5c51bed6b 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -153,6 +153,8 @@ public class FrameworkBuildTask extends Task{
         // Build every MSA files (SINGLE MODULE BUILD)
         //
         else if (buildFile.getName().endsWith(".msa")) {
+            File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);
+            System.out.println("Using FPD file [" + tmpFile.getPath() + "] as active platform. ");
             System.out.println("Start to build MSA file [" + buildFile.getPath() + "] ..>> ");
             GenBuildTask genBuildTask = new GenBuildTask();
             genBuildTask.setSingleModuleBuild(true);
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 73db7de4f4..c85cda83e2 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -500,6 +500,9 @@ public class FpdParserTask extends Task {
       @param moduleName current module identification
     **/
     private void updateFvs(String fvSequence, String fvName, FpdModuleIdentification fpdModuleId) {
+        if (fvName == null || fvName.trim().length() == 0) {
+            fvName = "NULL";
+        }
         String upcaseFvName = fvName.toUpperCase();
         String[] fvNameArray = upcaseFvName.split("[, \t]+");
         for (int i = 0; i < fvNameArray.length; i++) {
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index 19725167c5..101e14f008 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -26,13 +26,11 @@ import java.util.Set;
 import java.util.logging.Logger;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.xmlbeans.XmlObject;
 import org.tianocore.DbPathAndFilename;
 import org.tianocore.FrameworkDatabaseDocument;
 import org.tianocore.ModuleSurfaceAreaDocument;
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;
-import org.tianocore.PcdBuildDefinitionDocument;
 import org.tianocore.build.id.FpdModuleIdentification;
 import org.tianocore.build.id.ModuleIdentification;
 import org.tianocore.build.id.PackageIdentification;
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 0dcc80c926..f795e1e521 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -1924,9 +1924,6 @@ public class SurfaceAreaQuery {
     }
 
 	public static boolean isHaveTianoR8FlashMap(){
-        PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries  = null;
-        String[]            results;
-        int                 index;
         String[]            xPath       = new String[] {"/"};
         Object[]         returns     = get ("Externs", xPath);