Use the address of guid array as parameter directly for _PCD_MODE_xx macro for Dynami...

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
index dd33b540c1ffd3b70144ab50c9b4be5bff656450..fdf90b620c876b41bf7fdac8b8c7c60b4d1bb968 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
@@ -339,19 +339,22 @@ public class PCDAutoGenAction extends BuildAction {
                                                     (guidStringArray[4].substring(6, 8)),\r
                                                     (guidStringArray[4].substring(8, 10)),\r
                                                     (guidStringArray[4].substring(10, 12)));\r
-                    if (!isBuildUsedLibrary) {\r
-                        Pattern pattern = Pattern.compile("(" + guidStringCName + ")+?");\r
-                        Matcher matcher = pattern.matcher(cAutoGenString + " ");\r
-                        //\r
-                        // Find whether this guid array variable has been generated into autogen.c\r
-                        // For different DyanmicEx pcd token who use same token space guid, the token space\r
-                        // guid array should be only generated once.\r
-                        // \r
-                        if (!matcher.find()) {\r
+                    \r
+                    Pattern pattern = Pattern.compile("(" + guidStringCName + ")+?");\r
+                    Matcher matcher = pattern.matcher(cAutoGenString + " ");\r
+                    //\r
+                    // Find whether this guid array variable has been generated into autogen.c\r
+                    // For different DyanmicEx pcd token who use same token space guid, the token space\r
+                    // guid array should be only generated once.\r
+                    // \r
+                    if (!matcher.find()) {\r
+                        hAutoGenString += String.format("extern EFI_GUID %s;\r\n",\r
+                                                        guidStringCName);\r
+                        if (!isBuildUsedLibrary) {\r
                             cAutoGenString += String.format("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID %s = %s;\r\n",\r
                                                             guidStringCName,\r
                                                             guidString);\r
-                        }\r
+                        } \r
                     }\r
                 }\r
 \r