Because Pcd entity, exception and some action package are shared by Building tools...

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / pcd / action / CollectPCDAction.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
index 8242a4c87c363dca42b14fbc237c6a635f683b38..e0a3eb6fd3642716394fdc35db6b286895827c3e 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -41,17 +41,19 @@ import org.tianocore.ModuleSADocument;
 import org.tianocore.PcdBuildDefinitionDocument;\r
 import org.tianocore.PcdBuildDefinitionDocument.PcdBuildDefinition;\r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
-import org.tianocore.build.autogen.CommonDefinition;\r
 import org.tianocore.build.fpd.FpdParserTask;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.id.FpdModuleIdentification;\r
-import org.tianocore.build.pcd.action.ActionMessage;\r
-import org.tianocore.build.pcd.entity.DynamicTokenValue;\r
-import org.tianocore.build.pcd.entity.MemoryDatabaseManager;\r
-import org.tianocore.build.pcd.entity.SkuInstance;\r
-import org.tianocore.build.pcd.entity.Token;\r
-import org.tianocore.build.pcd.entity.UsageInstance;\r
-import org.tianocore.build.pcd.exception.EntityException;\r
+import org.tianocore.build.id.ModuleIdentification;\r
+import org.tianocore.pcd.action.ActionMessage;\r
+import org.tianocore.pcd.entity.CommonDefinition;\r
+import org.tianocore.pcd.entity.DynamicTokenValue;\r
+import org.tianocore.pcd.entity.MemoryDatabaseManager;\r
+import org.tianocore.pcd.entity.SkuInstance;\r
+import org.tianocore.pcd.entity.Token;\r
+import org.tianocore.pcd.entity.UsageIdentification;\r
+import org.tianocore.pcd.entity.UsageInstance;\r
+import org.tianocore.pcd.exception.EntityException;\r
 \r
 /**\r
     CStructTypeDeclaration   \r
@@ -1893,6 +1895,8 @@ public class CollectPCDAction {
         String                              datum             = null;\r
         int                                 maxDatumSize      = 0;\r
         String[]                            tokenSpaceStrRet  = null;\r
+        UsageIdentification                 usageId           = null;\r
+        ModuleIdentification                moduleId          = null;\r
 \r
         //\r
         // ----------------------------------------------\r
@@ -2112,10 +2116,17 @@ public class CollectPCDAction {
                 // 2.1.4), Create an usage instance for this token.\r
                 // ------------------------------------------------\r
                 // \r
+                moduleId = modules.get(index).getModuleId().getModule();\r
+                usageId = new UsageIdentification (moduleId.getName(), \r
+                                                   moduleId.getGuid(), \r
+                                                   moduleId.getPackage().getName(), \r
+                                                   moduleId.getPackage().getGuid(), \r
+                                                   modules.get(index).getModuleId().getArch(),\r
+                                                   moduleId.getVersion(),\r
+                                                   moduleId.getModuleType());\r
                 usageInstance = new UsageInstance(token, \r
-                                                  modules.get(index).getModuleId().getModule(), \r
+                                                  usageId,\r
                                                   pcdType,\r
-                                                  modules.get(index).getModuleId().getArch(), \r
                                                   datum,\r
                                                   maxDatumSize);\r
                 token.addUsageInstance(usageInstance);\r