Sync BaseTools Branch (version r2271) to EDKII main trunk.

  BaseTool Branch:
  https://edk2-buildtools.svn.sourceforge.net/svnroot/edk2-buildtools/branches/Releases/BaseTools_r2100

Signed-off-by: lgao4
Reviewed-by: hchen30

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12214 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 4 insertions, 8 deletions

diff --git a/BaseTools/Source/Python/GenFds/Section.py b/BaseTools/Source/Python/GenFds/Section.py
index a6d3c6319d..d26f464ab9 100644
--- a/BaseTools/Source/Python/GenFds/Section.py
+++ b/BaseTools/Source/Python/GenFds/Section.py
@@ -139,14 +139,10 @@ class Section (SectionClassObject):
                 else:

                     GenFdsGlobalVariable.InfLogger ("\nCurrent ARCH \'%s\' of File %s is not in the Support Arch Scope of %s specified by INF %s in FDF" %(FfsInf.CurrentArch, File.File, File.Arch, FfsInf.InfFileName))

 

-        if Suffix != None and os.path.exists(FfsInf.EfiOutputPath):

-            # Update to search files with suffix in all sub-dirs.

-            Tuple = os.walk(FfsInf.EfiOutputPath)

-            for Dirpath, Dirnames, Filenames in Tuple:

-                for F in Filenames:

-                    if os.path.splitext(F)[1] in (Suffix):

-                        FullName = os.path.join(Dirpath, F)

-                        FileList.append(FullName)

+        if Suffix != None:

+            for File in FfsInf.GetFinalBuildTargetList():

+                if os.path.splitext(File)[1] in (Suffix):

+                    FileList.append(File)

 

         #Process the file lists is alphabetical for a same section type

         if len (FileList) > 1: