Merge pull request #1493 from kivy/fix_gradle_build

KeyWeeUsr · web-flow · commit 891b286a584a · 2018-11-28T01:34:11.000+01:00
decode gradle path to avoid python3 crash
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -830,7 +830,7 @@ def apk(self, args):
                     # .../build/bootstrap_builds/sdl2-python3crystax/gradlew
                     # if docker on windows, gradle contains CRLF
                     output = shprint(
-                        sh.Command('dos2unix'), gradlew._path,
+                        sh.Command('dos2unix'), gradlew._path.decode('utf8'),
                         _tail=20, _critical=True, _env=env
                     )
                 if args.build_mode == "debug":

Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,7 @@ def apk(self, args):`
`830`	`830`	`# .../build/bootstrap_builds/sdl2-python3crystax/gradlew`
`831`	`831`	`# if docker on windows, gradle contains CRLF`
`832`	`832`	`output = shprint(`
`833`		`- sh.Command('dos2unix'), gradlew._path,`
	`833`	`+ sh.Command('dos2unix'), gradlew._path.decode('utf8'),`
`834`	`834`	`_tail=20, _critical=True, _env=env`
`835`	`835`	`)`
`836`	`836`	`if args.build_mode == "debug":`