diff options
| author | Vikas Pachdha <[email protected]> | 2017-04-03 11:11:17 +0200 |
|---|---|---|
| committer | Vikas Pachdha <[email protected]> | 2017-04-12 13:42:10 +0000 |
| commit | 70be880bcb7a832d9bb4fa87d9745b95a5498411 (patch) | |
| tree | 1482124aabf4328389150973eb391deee9ef653b /src/plugins/android/androidtoolmanager.cpp | |
| parent | 05b77e84681db3c225e8849d4312eb5da699235d (diff) | |
Android: Use avdmanager tool
android tool is deprecated since sdk tools version 25.3.0.
Use the new avdmanager tool
Task-number: QTCREATORBUG-17814
Change-Id: Id6f495f14e12d0069df08164cac1929b76d9e932
Reviewed-by: BogDan Vatra <[email protected]>
Diffstat (limited to 'src/plugins/android/androidtoolmanager.cpp')
| -rw-r--r-- | src/plugins/android/androidtoolmanager.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp index 508f542e85f..a6e61d96d9f 100644 --- a/src/plugins/android/androidtoolmanager.cpp +++ b/src/plugins/android/androidtoolmanager.cpp @@ -133,7 +133,7 @@ bool AndroidToolManager::removeAvd(const QString &name) const return response.result == SynchronousProcessResponse::Finished && response.exitCode == 0; } -QFuture<QVector<AndroidDeviceInfo>> AndroidToolManager::androidVirtualDevicesFuture() const +QFuture<AndroidDeviceInfoList> AndroidToolManager::androidVirtualDevicesFuture() const { return Utils::runAsync(&AndroidToolManager::androidVirtualDevices, m_config.androidToolPath(), m_config.sdkLocation(), @@ -161,7 +161,7 @@ AndroidConfig::CreateAvdInfo AndroidToolManager::createAvdImpl(AndroidConfig::Cr proc.setProcessEnvironment(env.toProcessEnvironment()); QStringList arguments; arguments << QLatin1String("create") << QLatin1String("avd") - << QLatin1String("-t") << info.target + << QLatin1String("-t") << info.target.name << QLatin1String("-n") << info.name << QLatin1String("-b") << info.abi; if (info.sdcardSize > 0) @@ -206,12 +206,11 @@ AndroidConfig::CreateAvdInfo AndroidToolManager::createAvdImpl(AndroidConfig::Cr return info; } -QVector<AndroidDeviceInfo> -AndroidToolManager::androidVirtualDevices(const Utils::FileName &androidTool, - const FileName &sdkLocationPath, - const Environment &environment) +AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::FileName &androidTool, + const FileName &sdkLocationPath, + const Environment &environment) { - QVector<AndroidDeviceInfo> devices; + AndroidDeviceInfoList devices; QString output; if (!androidToolCommand(androidTool, QStringList({"list", "avd"}), environment, &output)) return devices; |