BaseTools: Add HOST_APPLICATION module type.

It can be used to indicate a module can be build to run
as OS application and run in OS environment.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Xiaoyu Lu <xiaoyux.lu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index e66b7c9832..60970cd928 100644
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -748,7 +748,7 @@ class InfBuildData(ModuleBuildClassObject):
                 EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "No [Depex] section or no valid expression in [Depex] section for [%s] module" \

                                 % self.ModuleType, File=self.MetaFile)

 

-        if len(RecordList) != 0 and self.ModuleType == SUP_MODULE_USER_DEFINED:

+        if len(RecordList) != 0 and (self.ModuleType == SUP_MODULE_USER_DEFINED or self.ModuleType == SUP_MODULE_HOST_APPLICATION):

             for Record in RecordList:

                 if Record[4] not in [SUP_MODULE_PEIM, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SMM_DRIVER]:

                     EdkLogger.error('build', FORMAT_INVALID,

diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
index 0cc83110ef..41ae684d3e 100644
--- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
@@ -8,6 +8,7 @@
 from __future__ import absolute_import

 from collections import OrderedDict, defaultdict

 from Common.DataType import SUP_MODULE_USER_DEFINED

+from Common.DataType import SUP_MODULE_HOST_APPLICATION

 from .BuildClassObject import LibraryClassObject

 import Common.GlobalData as GlobalData

 from Workspace.BuildClassObject import StructurePcd

@@ -94,7 +95,7 @@ def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolcha
     # If a module has a MODULE_TYPE of USER_DEFINED,

     # do not link in NULL library class instances from the global [LibraryClasses.*] sections.

     #

-    if Module.ModuleType != SUP_MODULE_USER_DEFINED:

+    if Module.ModuleType != SUP_MODULE_USER_DEFINED and Module.ModuleType != SUP_MODULE_HOST_APPLICATION:

         for LibraryClass in Platform.LibraryClasses.GetKeys():

             if LibraryClass.startswith("NULL") and Platform.LibraryClasses[LibraryClass, Module.ModuleType]:

                 Module.LibraryClasses[LibraryClass] = Platform.LibraryClasses[LibraryClass, Module.ModuleType]

@@ -137,7 +138,7 @@ def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolcha
                     LibraryModule.LibraryClass.append(LibraryClassObject(LibraryClassName, [ModuleType]))

                 elif LibraryModule.LibraryClass is None \

                      or len(LibraryModule.LibraryClass) == 0 \

-                     or (ModuleType != SUP_MODULE_USER_DEFINED

+                     or (ModuleType != SUP_MODULE_USER_DEFINED and ModuleType != SUP_MODULE_HOST_APPLICATION

                          and ModuleType not in LibraryModule.LibraryClass[0].SupModList):

                     # only USER_DEFINED can link against any library instance despite of its SupModList

                     if FileName: