android sdk tools: adapt path to file hierarchy changes

SomberNight · SomberNight · commit 4267f066e697 · 2022-10-06T16:47:00.000Z
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
diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py
@@ -244,7 +244,10 @@ def apache_ant_dir(self):
     @property
     def sdkmanager_path(self):
         sdkmanager_path = join(
-            self.android_sdk_dir, 'tools', 'bin', 'sdkmanager')
+            self.android_sdk_dir, 'cmdline-tools', 'bin', 'sdkmanager')
+        if not os.path.isfile(sdkmanager_path):
+            sdkmanager_path = join(
+                self.android_sdk_dir, 'tools', 'bin', 'sdkmanager')
         if not os.path.isfile(sdkmanager_path):
             raise BuildozerException(
                 ('sdkmanager path "{}" does not exist, sdkmanager is not'
