aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androiddebugsupport.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android/androiddebugsupport.cpp')
-rw-r--r--src/plugins/android/androiddebugsupport.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 25967ba2e2..9da8ff511a 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -104,8 +104,10 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
params.displayName = AndroidManager::packageName(target);
params.remoteSetupNeeded = true;
params.useContinueInsteadOfRun = true;
- if (!Utils::HostOsInfo::isWindowsHost()) // Workaround for NDK 11c(b?)
+ if (!Utils::HostOsInfo::isWindowsHost() &&
+ AndroidConfigurations::currentConfig().ndkVersion() >= QVersionNumber(11, 0, 0)) {
params.useTargetAsync = true;
+ }
auto aspect = runConfig->extraAspect<DebuggerRunConfigurationAspect>();
if (aspect->useCppDebugger()) {