from Common.MultipleWorkspace import MultipleWorkspace as mws\r
from Common.BuildToolError import *\r
from Common.Misc import *\r
-from Common.String import *\r
+from Common.StringUtils import *\r
from BuildEngine import *\r
import Common.GlobalData as GlobalData\r
from collections import OrderedDict\r
Src = self.ReplaceMacro(Src)\r
Dst = self.ReplaceMacro(Dst)\r
if Dst not in self.ResultFileList:\r
- self.ResultFileList.append('%s' % Dst)\r
+ self.ResultFileList.append(Dst)\r
if '%s :' %(Dst) not in self.BuildTargetList:\r
self.BuildTargetList.append("%s :" %(Dst))\r
self.BuildTargetList.append('\t' + self._CP_TEMPLATE_[self._FileType] %{'Src': Src, 'Dst': Dst})\r
if DepsFileString == '':\r
continue\r
OutputFile = self.ReplaceMacro(OutputFile)\r
- self.ResultFileList.append('%s' % OutputFile)\r
+ self.ResultFileList.append(OutputFile)\r
DepsFileString = self.ReplaceMacro(DepsFileString)\r
self.BuildTargetList.append('%s : %s' % (OutputFile, DepsFileString))\r
CmdString = ' '.join(FfsCmdList).strip()\r