LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

set UTF-8 for android update command explicitly

Browse source 
Fix for fail in to update android package. It is happened to meet under the following conditions both.

* User environment is not used UTF-8 in default file.encoding in java
* Android-sdk license text is included not-ASCII code characters.

If user define JAVA_TOOL_OPTIONS in env, inherit it.
This commit is contained in:
attakei 2014-10-26 23:15:18 +09:00
parent 312fb67be4
commit dbd6be6e4b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildozer/targets/android.py
View file

@ -301,10 +301,12 @@ class TargetAndroid(Target):
def _android_update_sdk(self, packages): def _android_update_sdk(self, packages):
from buildozer.libs.pexpect import EOF from buildozer.libs.pexpect import EOF
java_tool_options = environ.get('JAVA_TOOL_OPTIONS', '')
child = self.buildozer.cmd_expect('{} update sdk -u -a -t {}'.format( child = self.buildozer.cmd_expect('{} update sdk -u -a -t {}'.format(
self.android_cmd, packages, self.android_cmd, packages,
cwd=self.buildozer.global_platform_dir), cwd=self.buildozer.global_platform_dir),
timeout=None) timeout=None,
env={'JAVA_TOOL_OPTIONS': java_tool_options + ' -Dfile.encoding=UTF-8'})
while True: while True:
index = child.expect([EOF, '[y/n]: ']) index = child.expect([EOF, '[y/n]: '])
if index == 0: if index == 0: