BaseTools: Remove hard-coded strings for target and tools_def

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3653

The "target.txt" and "tools_def.txt" filenames are hard-coded
at some places when global definitions are available at:
BaseTools/Source/Python/Common/TargetTxtClassObject.py:
DefaultTargetTxtFile
and
BaseTools/Source/Python/Common/ToolDefClassObject.py:
DefaultToolsDefFile

Use these global definitions instead.

Also remove the unused gBuildConfiguration and gToolsDefinition
variables from build.py

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 25f9d54874..d7668ba681 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -24,7 +24,7 @@ from Common import EdkLogger
 from Common.Misc import SaveFileOnChange

 

 from Common.TargetTxtClassObject import TargetTxtDict

-from Common.ToolDefClassObject import ToolDefDict

+from Common.ToolDefClassObject import ToolDefDict,gDefaultToolsDefFile

 from AutoGen.BuildEngine import ToolBuildRule

 import Common.DataType as DataType

 from Common.Misc import PathClass,CreateDirectory

@@ -103,7 +103,7 @@ class GenFdsGlobalVariable:
         TargetObj = TargetTxtDict()

         ToolDefinitionFile = TargetObj.Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]

         if ToolDefinitionFile == '':

-            ToolDefinitionFile = "Conf/tools_def.txt"

+            ToolDefinitionFile =  os.path.join('Conf', gDefaultToolsDefFile)

         if os.path.isfile(ToolDefinitionFile):

             ToolDefObj = ToolDefDict((os.path.join(os.getenv("WORKSPACE"), "Conf")))

             ToolDefinition = ToolDefObj.ToolDef.ToolsDefTxtDatabase