android sdk tools: adapt path to file hierarchy changes

SomberNight · SomberNight · commit a42a1e679cbc · 2022-10-06T16:29:39.000Z
Recent Android SDK tools, including e.g. "8092744" and "8512546" [0][1], use a different path structure. 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-8092744_latest.zip [1]: https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip Related: kivy#2540 kivy#2593
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -29,7 +29,9 @@ def get_targets(sdk_dir):
     if exists(join(sdk_dir, 'cmdline-tools', 'latest', 'bin', 'avdmanager')):
         avdmanager = sh.Command(join(sdk_dir, 'cmdline-tools', 'latest', 'bin', 'avdmanager'))
         targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
-
+    elif exists(join(sdk_dir, 'cmdline-tools', 'bin', 'avdmanager')):
+        avdmanager = sh.Command(join(sdk_dir, 'cmdline-tools', 'bin', 'avdmanager'))
+        targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
     elif exists(join(sdk_dir, 'tools', 'bin', 'avdmanager')):
         avdmanager = sh.Command(join(sdk_dir, 'tools', 'bin', 'avdmanager'))
         targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
