Skip to content

Commit ce4f225

Browse files
SomberNightaccumulator
authored andcommitted
android sdk tools: adapt path to file hierarchy changes
Recent Android SDK tools, including e.g. "8092744" and "8512546" [1][2], use a different path structure than e.g. "6514223" [0]. E.g. `sdkmanager` in older sdk tools used to be located at ${ANDROID_SDK_HOME}/tools/bin/sdkmanager but now it is at ${ANDROID_SDK_HOME}/cmdline-tools/bin/sdkmanager [0]: https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip [1]: https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip [2]: https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip Related: kivy/python-for-android#2540 kivy/python-for-android#2593
1 parent 10f9c8b commit ce4f225

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

buildozer/targets/android.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,10 @@ def apache_ant_dir(self):
244244
@property
245245
def sdkmanager_path(self):
246246
sdkmanager_path = join(
247-
self.android_sdk_dir, 'tools', 'bin', 'sdkmanager')
247+
self.android_sdk_dir, 'cmdline-tools', 'bin', 'sdkmanager')
248+
if not os.path.isfile(sdkmanager_path):
249+
sdkmanager_path = join(
250+
self.android_sdk_dir, 'tools', 'bin', 'sdkmanager')
248251
if not os.path.isfile(sdkmanager_path):
249252
raise BuildozerException(
250253
('sdkmanager path "{}" does not exist, sdkmanager is not'

0 commit comments

Comments
 (0)