feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: fix avd creation for google play images

Browse Source 
Latest avdmanager doesn't support "--tag" argument anymore and it fails
big time.

Change-Id: I9b1296a1813623d44add3e9e783b8395e6865cf2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
BogDan Vatra
2019-05-02 17:21:52 +03:00
committed by BogDan Vatra
parent 476125a212
commit 4b98f52c0e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidavdmanager.cpp
View File

@@ -124,10 +124,6 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig config, const CreateAv
Utils::equal(&SystemImage::abiName, result.abi)); Utils::equal(&SystemImage::abiName, result.abi));
if (image && image->isValid()) { if (image && image->isValid()) {
arguments << "-k" << image->sdkStylePath(); arguments << "-k" << image->sdkStylePath();
// Google api system images requires explicit abi as
// google-apis/ABI or --tag "google-apis"
if (image->sdkStylePath().contains(googleApiTag))
arguments << "--tag" << googleApiTag;
} else { } else {
QString name = result.sdkPlatform->displayText(); QString name = result.sdkPlatform->displayText();
qCDebug(avdManagerLog) << "AVD Create failed. Cannot find system image for the platform" qCDebug(avdManagerLog) << "AVD Create failed. Cannot find system image for the platform"