diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2018-11-23 10:08:35 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2018-12-17 12:41:31 +0000 |
| commit | 1d683dcc0730eecdf1054ecc7cbe86695bae3f1d (patch) | |
| tree | 4eddbea2155aab47c42ace4afc642e5847c5246c /src/plugins/android/androidmanager.cpp | |
| parent | 5e61e0aa730d825ac0b422192708fb10b5eb6859 (diff) | |
Android: Correct setting ANDROID_NDK_PLATFORM
Instead of using always just the minimum SDK version
we need to differentiate between SDK and NDK version.
Fixes: QTCREATORBUG-21536
Change-Id: I2f99c9d40ab05ccd2a4b8efeb2cd0300ecf0cf3a
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 336a1befd29..88778a989a8 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -249,6 +249,13 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit) return minSDKVersion; } +int AndroidManager::minimumNDK(ProjectExplorer::Target *target) +{ + auto qt = static_cast<Android::Internal::AndroidQtVersion *>( + QtSupport::QtKitInformation::qtVersion(target->kit())); + return qt->mininmumNDK(); +} + QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) { auto androidBuildApkStep |