| Index: tools/grit/grit/node/include.py
|
| diff --git a/tools/grit/grit/node/include.py b/tools/grit/grit/node/include.py
|
| index b073bc725cb0f9b30460fe55a5739a273c1445b9..dc29315e5a809307e835ecba4d948b9833109648 100644
|
| --- a/tools/grit/grit/node/include.py
|
| +++ b/tools/grit/grit/node/include.py
|
| @@ -74,7 +74,7 @@ class IncludeNode(base.Node):
|
| '''
|
| return self.FilenameToOpen()
|
|
|
| - def GetDataPackPair(self, lang):
|
| + def GetDataPackPair(self, lang, encoding):
|
| '''Returns a (id, string) pair that represents the resource id and raw
|
| bytes of the data. This is used to generate the data pack data file.
|
| '''
|
| @@ -90,6 +90,8 @@ class IncludeNode(base.Node):
|
| data = infile.read()
|
| infile.close()
|
|
|
| + # Include does not care about the encoding, because it only returns binary
|
| + # data.
|
| return id, data
|
|
|
| def Flatten(self, output_dir):
|
| @@ -136,4 +138,3 @@ class IncludeNode(base.Node):
|
| node.EndParsing()
|
| return node
|
| Construct = staticmethod(Construct)
|
| -
|
|
|