BaseTools: Fix the bug for .aml to use ASL binary type in Asbuilt inf

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

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 2cc6970325fffb4a5ee2d4a5b189e77f770a8990..ae0f8a6e7ab7f2dfe52ef7ce7d163c0eddda5eff 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1115,7 +1115,7 @@ class PlatformAutoGen(AutoGen):
     ## Generate Fds Command\r
     def _GenFdsCommand(self):\r
         return self.Workspace.GenFdsCommand\r
-               \r
+\r
     ## Create makefile for the platform and mdoules in it\r
     #\r
     #   @param      CreateModuleMakeFile    Flag indicating if the makefile for\r
@@ -3666,34 +3666,29 @@ class ModuleAutoGen(AutoGen):
             AsBuiltInfDict['pcd_is_driver_string'] += [DriverType]\r
 \r
         if 'UEFI_SPECIFICATION_VERSION' in self.Specification:\r
-          AsBuiltInfDict['module_uefi_specification_version'] += [self.Specification['UEFI_SPECIFICATION_VERSION']]\r
+            AsBuiltInfDict['module_uefi_specification_version'] += [self.Specification['UEFI_SPECIFICATION_VERSION']]\r
         if 'PI_SPECIFICATION_VERSION' in self.Specification:\r
-          AsBuiltInfDict['module_pi_specification_version'] += [self.Specification['PI_SPECIFICATION_VERSION']]\r
+            AsBuiltInfDict['module_pi_specification_version'] += [self.Specification['PI_SPECIFICATION_VERSION']]\r
 \r
         OutputDir = self.OutputDir.replace('\\', '/').strip('/')\r
-        if self.ModuleType in ['BASE', 'USER_DEFINED']:\r
-          for Item in self.CodaTargetList:\r
+\r
+        for Item in self.CodaTargetList:\r
             File = Item.Target.Path.replace('\\', '/').strip('/').replace(OutputDir, '').strip('/')\r
             if Item.Target.Ext.lower() == '.aml':\r
-              AsBuiltInfDict['binary_item'] += ['ASL|' + File]\r
+                AsBuiltInfDict['binary_item'] += ['ASL|' + File]\r
             elif Item.Target.Ext.lower() == '.acpi':\r
-              AsBuiltInfDict['binary_item'] += ['ACPI|' + File]\r
-            else:\r
-              AsBuiltInfDict['binary_item'] += ['BIN|' + File]\r
-        else:\r
-          for Item in self.CodaTargetList:\r
-            File = Item.Target.Path.replace('\\', '/').strip('/').replace(OutputDir, '').strip('/')\r
-            if Item.Target.Ext.lower() == '.efi':\r
-              AsBuiltInfDict['binary_item'] += ['PE32|' + self.Name + '.efi']\r
+                AsBuiltInfDict['binary_item'] += ['ACPI|' + File]\r
+            elif Item.Target.Ext.lower() == '.efi':\r
+                AsBuiltInfDict['binary_item'] += ['PE32|' + self.Name + '.efi']\r
             else:\r
-              AsBuiltInfDict['binary_item'] += ['BIN|' + File]\r
-          if self.DepexGenerated:\r
+                AsBuiltInfDict['binary_item'] += ['BIN|' + File]\r
+        if self.DepexGenerated:\r
             if self.ModuleType in ['PEIM']:\r
-              AsBuiltInfDict['binary_item'] += ['PEI_DEPEX|' + self.Name + '.depex']\r
+                AsBuiltInfDict['binary_item'] += ['PEI_DEPEX|' + self.Name + '.depex']\r
             if self.ModuleType in ['DXE_DRIVER', 'DXE_RUNTIME_DRIVER', 'DXE_SAL_DRIVER', 'UEFI_DRIVER']:\r
-              AsBuiltInfDict['binary_item'] += ['DXE_DEPEX|' + self.Name + '.depex']\r
+                AsBuiltInfDict['binary_item'] += ['DXE_DEPEX|' + self.Name + '.depex']\r
             if self.ModuleType in ['DXE_SMM_DRIVER']:\r
-              AsBuiltInfDict['binary_item'] += ['SMM_DEPEX|' + self.Name + '.depex']\r
+                AsBuiltInfDict['binary_item'] += ['SMM_DEPEX|' + self.Name + '.depex']\r
 \r
         Bin = self._GenOffsetBin()\r
         if Bin:\r
@@ -3845,8 +3840,8 @@ class ModuleAutoGen(AutoGen):
                 PcdEntry = PcdComments + '\n  ' + PcdEntry\r
             AsBuiltInfDict['pcd_item'] += [PcdEntry]\r
         for Item in self.BuildOption:\r
-          if 'FLAGS' in self.BuildOption[Item]:\r
-            AsBuiltInfDict['flags_item'] += ['%s:%s_%s_%s_%s_FLAGS = %s' % (self.ToolChainFamily, self.BuildTarget, self.ToolChain, self.Arch, Item, self.BuildOption[Item]['FLAGS'].strip())]\r
+            if 'FLAGS' in self.BuildOption[Item]:\r
+                AsBuiltInfDict['flags_item'] += ['%s:%s_%s_%s_%s_FLAGS = %s' % (self.ToolChainFamily, self.BuildTarget, self.ToolChain, self.Arch, Item, self.BuildOption[Item]['FLAGS'].strip())]\r
 \r
         # Generated LibraryClasses section in comments.\r
         for Library in self.LibraryAutoGenList:\r