Made buildozer respect user sdk dir when accessing sdkmanager

This commit is contained in:
Alexander Taylor 2019-02-02 14:18:45 +00:00
parent f815965159
commit a780cc470a

View file

@ -98,12 +98,9 @@ class TargetAndroid(Target):
def _sdkmanager(self, *args, **kwargs): def _sdkmanager(self, *args, **kwargs):
"""Call the sdkmanager in our Android SDK with the given arguments.""" """Call the sdkmanager in our Android SDK with the given arguments."""
# Use the android-sdk dir as cwd by default # Use the android-sdk dir as cwd by default
kwargs['cwd'] = kwargs.get( kwargs['cwd'] = kwargs.get('cwd', self.android_sdk_dir)
'cwd', os.path.join(self.buildozer.global_platform_dir,
'android-sdk'))
sdkmanager_path = os.path.join(self.buildozer.global_platform_dir, sdkmanager_path = os.path.join(self.android_sdk_dir,
'android-sdk',
'tools', 'tools',
'bin', 'bin',
'sdkmanager') 'sdkmanager')