BaseTools:Add [packages] section in dsc file

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / ModuleAutoGen.py

diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
index f0812b6887be6f9fbdb14003f2efff229633fb34..e6d6c43810ec5bda0a7df3fc584cf05546a1a272 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py
@@ -462,14 +462,31 @@ class ModuleAutoGen(AutoGen):
     def BuildCommand(self):\r
         return self.PlatformInfo.BuildCommand\r
 \r
-    ## Get object list of all packages the module and its dependent libraries belong to\r
+    ## Get Module package and Platform package\r
+    #\r
+    #   @retval list The list of package object\r
+    #\r
+    @cached_property\r
+    def PackageList(self):\r
+        PkagList = []\r
+        if self.Module.Packages:\r
+            PkagList.extend(self.Module.Packages)\r
+        Platform = self.BuildDatabase[self.PlatformInfo.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
+        for Package in Platform.Packages:\r
+            if Package in PkagList:\r
+                continue\r
+            PkagList.append(Package)\r
+        return PkagList\r
+\r
+    ## Get object list of all packages the module and its dependent libraries belong to and the Platform depends on\r
     #\r
     #   @retval     list    The list of package object\r
     #\r
     @cached_property\r
     def DerivedPackageList(self):\r
         PackageList = []\r
-        for M in [self.Module] + self.DependentLibraryList:\r
+        PackageList.extend(self.PackageList)\r
+        for M in self.DependentLibraryList:\r
             for Package in M.Packages:\r
                 if Package in PackageList:\r
                     continue\r
@@ -938,13 +955,13 @@ class ModuleAutoGen(AutoGen):
         self.Targets\r
         return self._FileTypes\r
 \r
-    ## Get the list of package object the module depends on\r
+    ## Get the list of package object the module depends on and the Platform depends on\r
     #\r
     #   @retval     list    The package object list\r
     #\r
     @cached_property\r
     def DependentPackageList(self):\r
-        return self.Module.Packages\r
+        return self.PackageList\r
 \r
     ## Return the list of auto-generated code file\r
     #\r
@@ -1101,7 +1118,7 @@ class ModuleAutoGen(AutoGen):
         RetVal.append(self.MetaFile.Dir)\r
         RetVal.append(self.DebugDir)\r
 \r
-        for Package in self.Module.Packages:\r
+        for Package in self.PackageList:\r
             PackageDir = mws.join(self.WorkspaceDir, Package.MetaFile.Dir)\r
             if PackageDir not in RetVal:\r
                 RetVal.append(PackageDir)\r
@@ -1125,7 +1142,7 @@ class ModuleAutoGen(AutoGen):
     @cached_property\r
     def PackageIncludePathList(self):\r
         IncludesList = []\r
-        for Package in self.Module.Packages:\r
+        for Package in self.PackageList:\r
             PackageDir = mws.join(self.WorkspaceDir, Package.MetaFile.Dir)\r
             IncludesList = Package.Includes\r
             if Package._PrivateIncludes:\r