From 717c7bfd9f14c6928f231f522078a8ba333810a1 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Wed, 18 Apr 2018 10:40:54 +0200 Subject: [PATCH] Android: Add explicit tag for google_apis system images Task-number: QTCREATORBUG-20298 Change-Id: I9bc4d9192584ffbc1180ae7b69f334c915ca16f4 Reviewed-by: BogDan Vatra --- src/plugins/android/androidavdmanager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index 5af95e7a260..954053b08bc 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -53,6 +53,7 @@ const char avdInfoPathKey[] = "Path:"; const char avdInfoAbiKey[] = "abi.type"; const char avdInfoTargetKey[] = "target"; const char avdInfoErrorKey[] = "Error:"; +const char googleApiTag[] = "google_apis"; const int avdCreateTimeoutMs = 30000; @@ -111,13 +112,17 @@ static CreateAvdInfo createAvdCommand(const AndroidConfig config, const CreateAv return result; } - QStringList arguments({"create", "avd", "-k", result.sdkPlatform->sdkStylePath(), "-n", result.name}); + QStringList arguments({"create", "avd", "-n", result.name}); if (!result.abi.isEmpty()) { SystemImage *image = Utils::findOrDefault(result.sdkPlatform->systemImages(), Utils::equal(&SystemImage::abiName, result.abi)); if (image && image->isValid()) { 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 { QString name = result.sdkPlatform->displayText(); qCDebug(avdManagerLog) << "AVD Create failed. Cannot find system image for the platform"