Revert the change in r19143 for BUILDRULEORDER.

[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 cf0b4466f9925f563a8e927fcf76d2477d602248..4c627dfb555a1c5d2287b8d2f0063441a5950e03 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -2713,36 +2713,9 @@ class ModuleAutoGen(AutoGen):
                 if F.Dir not in self.IncludePathList and self.AutoGenVersion >= 0x00010005:\r
                     self.IncludePathList.insert(0, F.Dir)\r
                 self._SourceFileList.append(F)\r
-\r
-            self._MatchBuildRuleOrder(self._SourceFileList)\r
-\r
-            for F in self._SourceFileList:\r
                 self._ApplyBuildRule(F, TAB_UNKNOWN_FILE)\r
         return self._SourceFileList\r
 \r
-    def _MatchBuildRuleOrder(self, FileList):\r
-        Order_Dict = {}\r
-        self._GetModuleBuildOption()\r
-        for SingleFile in FileList:\r
-            if self.BuildRuleOrder and SingleFile.Ext in self.BuildRuleOrder:\r
-                key = SingleFile.Path.split(SingleFile.Ext)[0]\r
-                if key in Order_Dict:\r
-                    Order_Dict[key].append(SingleFile.Ext)\r
-                else:\r
-                    Order_Dict[key] = [SingleFile.Ext]\r
-\r
-        RemoveList = []\r
-        for F in Order_Dict:\r
-            if len(Order_Dict[F]) > 1:\r
-                Order_Dict[F].sort(key=lambda i: self.BuildRuleOrder.index(i))\r
-                for Ext in Order_Dict[F][1:]:\r
-                    RemoveList.append(F + Ext)\r
-                   \r
-        for item in RemoveList:\r
-            FileList.remove(item)\r
-\r
-        return FileList\r
-\r
     ## Return the list of unicode files\r
     def _GetUnicodeFileList(self):\r
         if self._UnicodeFileList == None:\r