Commit Graph

15 Commits

Author SHA1 Message Date
Rami Potinkara
50b749fc42 Android: Qt 6.5 NDK25 update to sdk_definitions.json
Qt 6.5 NDK25 as new default.
Qt 6.4 NDK23 as it requires it.

Task-number: QTCREATORBUG-28426
Change-Id: I2d742481a1c490cc9dfe8a25870a5699e38c4315
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
2022-11-10 09:12:01 +00:00
Alessandro Portale
c899793b37 Android: Fix version mapping from sdk_definitions.json
- Support multi-digit values for version ranges, via "+" in the RegExp
- Turn the RegExp expression into a raw string for easier reading
- Fix shortVersion (Maj.Min.-1) handling by appending the ".-1"
- Explicitly define the Patch number range for 5.15 in sdk_definitions

Change-Id: Icf22f2b4f865b4d5bcff48569aa58137294129ce
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-04 08:26:04 +00:00
Assam Boudjelthia
1cf9d06675 Android: update NDK version for latest Qt version (Qt 6.4)
Since Qt 6.4 is built with NDK r23b, use that by default for
user apps as well. This is also needed to account for QTBUG-102972.

Task-number: QTBUG-102972
Change-Id: Id8485e0477b5e36c4d895582f5700c1f16b5a0c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 21:07:43 +00:00
Assam Boudjelthia
5454dda249 Android: keep up with sdk tools changing folder structure
The cmdline-tools package used to have the folder structure "tools/bin".
However, latest packages are using the structure "cmdline-tools/bin".
And since subsequent updates we are installing "cmdline-tools;latest"
package, it will be put in "cmdline-tools/latest" folder, so we cannot
extract to that path, or otherwise sdkmanager will complain that the
path is in use.

Currently we extract it and put it under the SDK path, then use it to
install the essential packages, then it won't be used at all. This patch
changes that by extracting the downloaded package into a temporary
location, and use sdkmanager from there directly.

Also, this patch updates the links to the cmdline-tools along the way.

Fixes: QTCREATORBUG-27174
Change-Id: I1f5d0e38f5a026631e8a3852821d85a69d543c32
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-17 20:45:07 +00:00
Assam Boudjelthia
4a228ab764 Android: Update Default Ndk version, build-tools, platforms versions
NDK r22b is used in Qt 6 and on 5.15.9 onward. Also update the
build-tools and platforms to a more recent version.

Change-Id: Ia9829def010047af528ce704f769a40910093fba
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-01 09:10:49 +00:00
Assam Boudjelthia
68e20abfef Android: partially revert 4035fc2433
The links for the new sdk tools were using a different folder structure
in the zip archive which are different from the previous packages and
from what QC expects.

Fixes: QTCREATORBUG-25017
Change-Id: Id288d5cc59a3bad87ce2c795fba28b7ebfa027e5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-30 17:29:26 +00:00
Assam Boudjelthia
4035fc2433 Android: update Sdk tools links and build-tools version
Fixes: QTCREATORBUG-24621
Change-Id: Id1b11452631612bc2b03af1d23cb78bc9b439316
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2020-11-05 14:47:34 +00:00
Assam Boudjelthia
7b3accc78e Android: update ndk version
Update NDK version from 21.1.6352462 to 21.3.6528147, the most recent
one.

Change-Id: I0d5f33e78816464c6dab3303488aa353662bff47
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-02 08:29:45 +00:00
Assam Boudjelthia
560f5bfdc7 Android: update to latest SDK cmdline-tools
Also, add the --sdk_root argument which is needed.

Change-Id: I85f9444b35bb31aed9670bd322f2754061cf70c6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-07-01 13:26:44 +00:00
Assam Boudjelthia
6bea157c9b Revert "Android: Also install LLDB from SDK"
This reverts commit 3e79c7da48.

Reason for revert: sdkmanager no longer offers lldb packages (a recent change from Google) instead it's provided within the latest NDK ndk;21.1.6352462.

Change-Id: If98ac86bb5086614d03f06e5f8c8e847bc65c0ed
Reviewed-by: hjk <hjk@qt.io>
2020-05-19 13:42:00 +00:00
Eike Ziller
8292807e0d Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidextralibrarylistmodel.cpp

Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2
2020-05-19 15:23:16 +02:00
Assam Boudjelthia
9e31378b50 Android: use latest ndk version instead of ndk-bundle
Fixes: QTCREATORBUG-23903
Change-Id: Iae3561818d86952dad9209d55984c82498d07575
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-05-18 07:46:45 +00:00
hjk
3e79c7da48 Android: Also install LLDB from SDK
Change-Id: I7ebf70387935a7e88b80b57d97659ec5f50ba758
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-06 15:37:01 +00:00
Assam Boudjelthia
76c2208bac Android: Add windows usb drivers to SDK essentials
Add "extras;google;usb_driver" to essentials packages to be installed
automatically. So, change would also account for platform specific
packages.

Change-Id: I9b452b9ee30be9f606ca77fcd79712d66fab84e7
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2020-03-18 10:50:28 +00:00
Assam Boudjelthia
f46099d21e Android: Automatically download SDK tools and essential packages
Automatically download Android SDK Tools to default path
used by Android Studio, then essential packages will be installed
using the sdkmanager tool. Automatic installation can also be
triggered by an added button in the settings page.

Essentials packages include NDK Bundle and other NDK versions
required by previous Qt versions.

An sdk_definitions.json file holds download paths for SDK Tools,
and other (Qt version <-> essential packages) combinations.

[ChangeLog][Android] Automatically download SDK Tools, NDKs and
all essential packages for Android builds.

Task-number: QTCREATORBUG-23285
Change-Id: I90e7aafecd017d2bdc959e403711d9d440a6bbb2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-07 18:21:30 +00:00