Commit Graph

11 Commits

Author SHA1 Message Date
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