Skip to content

Commit f517289

Browse files
SomberNightaccumulator
authored andcommittedJun 29, 2023
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#2540 kivy#2593
1 parent 7d64ee9 commit f517289

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed
 

‎pythonforandroid/build.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ def get_targets(sdk_dir):
2929
if exists(join(sdk_dir, 'cmdline-tools', 'latest', 'bin', 'avdmanager')):
3030
avdmanager = sh.Command(join(sdk_dir, 'cmdline-tools', 'latest', 'bin', 'avdmanager'))
3131
targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
32-
32+
elif exists(join(sdk_dir, 'cmdline-tools', 'bin', 'avdmanager')):
33+
avdmanager = sh.Command(join(sdk_dir, 'cmdline-tools', 'bin', 'avdmanager'))
34+
targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')
3335
elif exists(join(sdk_dir, 'tools', 'bin', 'avdmanager')):
3436
avdmanager = sh.Command(join(sdk_dir, 'tools', 'bin', 'avdmanager'))
3537
targets = avdmanager('list', 'target').stdout.decode('utf-8').split('\n')

0 commit comments

Comments
 (0)
Please sign in to comment.