From: Carsey, Jaben <jaben.carsey@intel.com>
Date: Wed, 29 Aug 2018 14:42:21 +0000 (+0800)
Subject: BaseTools: Refactor to remove functionally equivalent functions
X-Git-Tag: edk2-stable201903~1103
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=f5f4667dae711a7e34c75a4cd8f7a683c732a566

BaseTools: Refactor to remove functionally equivalent functions

IsSupportedArch and IsBinaryModule return the same value under the same
curcimstances.  Remove newer one with fewer callers and send them to the
other function.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 15365e7b1d..95370d1821 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1091,7 +1091,7 @@ class PlatformAutoGen(AutoGen):
             for Inf in self._AsBuildInfList:
                 InfClass = PathClass(NormPath(Inf), GlobalData.gWorkspace, self.Arch)
                 M = self.BuildDatabase[InfClass, self.Arch, self.BuildTarget, self.ToolChain]
-                if not M.IsSupportedArch:
+                if not M.IsBinaryModule:
                     continue
                 self._AsBuildModuleList.append(InfClass)
         # get library/modules for build
@@ -1346,7 +1346,7 @@ class PlatformAutoGen(AutoGen):
                 # If a module INF in FDF but not in current arch's DSC module list, it must be module (either binary or source)
                 # for different Arch. PCDs in source module for different Arch is already added before, so skip the source module here.
                 # For binary module, if in current arch, we need to list the PCDs into database.
-                if not M.IsSupportedArch:
+                if not M.IsBinaryModule:
                     continue
                 # Override the module PCD setting by platform setting
                 ModulePcdList = self.ApplyPcdSetting(M, M.Pcds)
diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py
index 1325b4f029..d666c092a6 100644
--- a/BaseTools/Source/Python/Workspace/InfBuildData.py
+++ b/BaseTools/Source/Python/Workspace/InfBuildData.py
@@ -578,12 +578,7 @@ class InfBuildData(ModuleBuildClassObject):
             EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, ExtraData=ErrorInfo, File=self.MetaFile)
 
         return Binaries
-    ## Check whether it exists the binaries with current ARCH in AsBuild INF
-    def _IsSupportedArch(self):
-        if self._GetBinaries() and not self._GetSourceFiles():
-            return True
-        else:
-            return False
+
     ## Retrieve source files
     def _GetSourceFiles(self):
         # Ignore all source files in a binary build mode
@@ -1170,4 +1165,3 @@ class InfBuildData(ModuleBuildClassObject):
     Depex                   = property(_GetDepex)
     DepexExpression         = property(_GetDepexExpression)
     IsBinaryModule          = property(_IsBinaryModule)
-    IsSupportedArch         = property(_IsSupportedArch)