summaryrefslogtreecommitdiffstats
path: root/remoting/tools
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 12:46:22 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 12:46:22 +0000
commit37f6edb3670afc1aa7cf6b11fede783328fb49b7 (patch)
tree9426f6d5327606f272e71d9f30df7198421c5a81 /remoting/tools
parent0ea8a6b9d32b646855fe14ed6abf9f2242c4dc23 (diff)
downloadchromium_src-37f6edb3670afc1aa7cf6b11fede783328fb49b7.zip
chromium_src-37f6edb3670afc1aa7cf6b11fede783328fb49b7.tar.gz
chromium_src-37f6edb3670afc1aa7cf6b11fede783328fb49b7.tar.bz2
Revert 245489 "make utf-8 default encoding for remoting_localize.py"
Broke compilation on windows clobber builder: mc : error : -u switch cannot be used with non-Unicode message file! > make utf-8 default encoding for remoting_localize.py > > Review URL: https://codereview.chromium.org/140793007 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/141003004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
-rwxr-xr-xremoting/tools/build/remoting_localize.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/tools/build/remoting_localize.py b/remoting/tools/build/remoting_localize.py
index 5c4eeb1..6a88884 100755
--- a/remoting/tools/build/remoting_localize.py
+++ b/remoting/tools/build/remoting_localize.py
@@ -590,7 +590,7 @@ def ReadMessagesFromFile(file_name):
return values
-def WriteIfChanged(file_name, contents, encoding):
+def WriteIfChanged(file_name, contents, encoding='utf-16'):
"""
Writes the specified contents to the specified file_name
iff the contents are different than the current contents.
@@ -743,8 +743,8 @@ def DoMain(argv):
'-d', '--define', dest='define', action='append', type='string',
help='define a variable (NAME=VALUE).')
parser.add_option(
- '--encoding', dest='encoding', type='string', default='utf-8',
- help="set the encoding of <output>. 'utf-8' is the default.")
+ '--encoding', dest='encoding', type='string', default='utf-16',
+ help="set the encoding of <output>. 'utf-16' is the default.")
parser.add_option(
'--jinja2', dest='jinja2', type='string',
help="specifies path to the jinja2 library.")