From 88eaa7f3323845321f30b716de8dcb4e4aa78c2a Mon Sep 17 00:00:00 2001 From: Gabriel Pettier Date: Sun, 25 Nov 2018 21:59:22 +0100 Subject: [PATCH] fix WSL compatibility change breaking normal build --- buildozer/targets/android.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 9309a34..f6268f9 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -434,15 +434,17 @@ class TargetAndroid(Target): join(self.android_sdk_dir, 'tools.save'), join(self.android_sdk_dir, 'tools') ) - old_android_cmd = self.android_cmd - self.android_cmd = join( - self.android_sdk_dir, - 'tools.save', - self.android_cmd.split('/')[-1] - ) + old_android_cmd = self.android_cmd + self.android_cmd = join( + self.android_sdk_dir, + 'tools.save', + self.android_cmd.split('/')[-1] + ) + self._android_update_sdk('tools,platform-tools') - self.android_cmd = old_android_cmd + if WSL: + self.android_cmd = old_android_cmd sh.rm('-rf', join(self.android_sdk_dir, 'tools.save')) else: self.buildozer.info('Skipping Android SDK update due to spec file setting')