From 503fb603c3ed12fc65135e43977142a267938c97 Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Thu, 19 Apr 2018 12:19:03 +0200
Subject: [PATCH] Android: Set proper environment for the avdmanager tool

Task-number: QTCREATORBUG-19988
Change-Id: If34b4ff570ed6d6fdbb91435913d9130feceb499
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/android/androidavdmanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 954053b08bc..c9f1f0eaa64 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -66,6 +66,8 @@ static bool avdManagerCommand(const AndroidConfig config, const QStringList &arg
 {
     QString avdManagerToolPath = config.avdManagerToolPath().toString();
     Utils::SynchronousProcess proc;
+    auto env = AndroidConfigurations::toolsEnvironment(config).toStringList();
+    proc.setEnvironment(env);
     Utils::SynchronousProcessResponse response = proc.runBlocking(avdManagerToolPath, args);
     if (response.result == Utils::SynchronousProcessResponse::Finished) {
         if (output)