X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Fautogen%2FAutoGen.java;h=a8ec270355146dd8693d376a193171900050f649;hp=366e0ac59d98de60400444fce8d63ceff549e82a;hb=eece174ad00f11db8688a36f7c7ef57c9ced98db;hpb=9e857952dbebe1fcadb4efeee8ca338c1123bd13;ds=sidebyside

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 366e0ac59d..a8ec270355 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -456,25 +456,18 @@ public class AutoGen {
 		GuidGuidToAutogenC(fileBuffer);
 
 		//
-		// Call pcd autogen. PCDAutoGenAction tool only need module name and
-		// isPcdEmulatedDriver as parameter. Library inherits PCD and module's
-		// PCD information has been collected in FPDParser task by
-		// CollectPCDAction.
-		// Note : when PCD image tool ready,
-		// isPCDEmulatedDriver parameter will be removed.
-		//
-		 try {
-//		 this.myPcdAutogen = new PCDAutoGenAction(moduleId.getName(),
-//		 moduleId.getGuid(), moduleId.getPackage().getName(), moduleId.getPackage().getGuid(),this.arch,moduleId.getVersion(),false, null);
-         this.myPcdAutogen = new PCDAutoGenAction(moduleId.getName(),null,null,null, this.arch,null,false, null);
-		 this.myPcdAutogen.execute();
-		 } catch (Exception e) {
-		 throw new BuildException("PCD Autogen failed:" + e.getMessage());
-		 }
+		// Call pcd autogen. 
+		//
+                this.myPcdAutogen = new PCDAutoGenAction(moduleId, this.arch, false, null);
+                try {
+                    this.myPcdAutogen.execute();
+                } catch (Exception exp) {
+                    throw new BuildException (exp.getMessage());
+                }
 		
 		if (this.myPcdAutogen != null) {
-            fileBuffer.append("\r\n");
-			fileBuffer.append(this.myPcdAutogen.OutputC());
+                    fileBuffer.append("\r\n");
+                    fileBuffer.append(this.myPcdAutogen.OutputC());
 		}
 
 		if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {
@@ -613,33 +606,21 @@ public class AutoGen {
 		fileBuffer.append("\r\n");
 
 		//
-		// Call pcd autogen. PCDAutoGenAction tool only need module name and
-		// isPcdEmulatedDriver as parameter. Library inherit PCD and module's
-		// PCD information has been collected in FPDParser task by
-		// CollectPCDAction.
-		// Note : when PCD image tool ready,
-		// isPCDEmulatedDriver parameter will be removed.
+		// Call pcd autogen. 
 		//
+                this.myPcdAutogen = new PCDAutoGenAction(this.moduleId,
+                                                         this.arch,
+                                                         true, 
+                                                         SurfaceAreaQuery.getModulePcdEntryNameArray());
 		try {
-//			 this.myPcdAutogen = new PCDAutoGenAction(this.moduleId.getName(),
-//			 this.moduleId.getGuid(),moduleId.getPackage().getName(),moduleId.getPackage().getGuid(), this.arch, moduleId.getVersion(),true, SurfaceAreaQuery.getModulePcdEntryNameArray());
-            this.myPcdAutogen = new PCDAutoGenAction(this.moduleId.getName(),
-                                                     null,
-                                                     null,
-                                                     null,
-                                                     this.arch,
-                                                     null,
-                                                     true, 
-                                                     SurfaceAreaQuery.getModulePcdEntryNameArray());
-                     
-			this.myPcdAutogen.execute();
+                    this.myPcdAutogen.execute();
 		} catch (Exception e) {
-			throw new BuildException(e.getMessage());
+                    throw new BuildException(e.getMessage());
 		}
 
 		if (this.myPcdAutogen != null) {
-            fileBuffer.append("\r\n");
-			fileBuffer.append(this.myPcdAutogen.OutputC());
+                    fileBuffer.append("\r\n");
+                    fileBuffer.append(this.myPcdAutogen.OutputC());
 		}
 
 		if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {