diff options
| author | Max Bespalov <bespalov.maxim.a@gmail.com> | 2022-06-19 14:21:41 +0200 |
|---|---|---|
| committer | Max Bespalov <bespalov.maxim.a@gmail.com> | 2022-06-23 16:51:06 +0000 |
| commit | b20256ccef06f515d1cbfdd51bf2b2398d114c70 (patch) | |
| tree | 020b7f3081a7a5aba5f3eba168e4da1f4a602374 /docker/bionic/Dockerfile | |
| parent | 08e3d36098937844e84d447527ac50b9e19e74ff (diff) | |
Fix Android build-tools detection, if it was installed via cmdline-tools
The modern way to install android packages is to use cmdline-tools. The
old way was to use SDK tools, but now it is deprecated (see
https://developer.android.com/studio/releases/sdk-tools). There is a code
in AndroidSdkProbe which looks for android executable in SDK tools folder
to prove, that the folder does contain Android SDK. But if you use
cmdline-tools, there is no folder "tools" anymore. The probe fails to find
build tools. The fix is to look for build-tools directory.
Fixes: QBS-1700
Change-Id: Iad92664ba07d034ba365e8b7b178cd47f5d3f187
Reviewed-by: Raphaël Cotty <raphael.cotty@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker/bionic/Dockerfile')
0 files changed, 0 insertions, 0 deletions