Commit 3dc6510d authored by Christian Stenger's avatar Christian Stenger Committed by hjk

Android: Debugger: Avoid warning regarding release build

This is just a workaround to avoid the warning of having a release
build although building debug. In practice the validation should
be done on the main library instead of the app_process of an
Android executable.

Change-Id: I4fe4ccc790d9e373a11f851c8216362188a97b85
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 1d0582ec
......@@ -101,6 +101,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
if (ToolChain *tc = ToolChainKitInformation::toolChain(kit))
params.toolChainAbi = tc->targetAbi();
params.executable = target->activeBuildConfiguration()->buildDirectory().toString() + QLatin1String("/app_process");
params.skipExecutableValidation = true;
params.remoteChannel = runConfig->remoteChannel();
params.solibSearchPath = AndroidManager::androidQtSupport(target)->soLibSearchPath(target);
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
......
......@@ -1793,6 +1793,8 @@ void DebuggerEngine::setStateDebugging(bool on)
void DebuggerEngine::validateExecutable(DebuggerStartParameters *sp)
{
if (sp->skipExecutableValidation)
return;
if (sp->languages == QmlLanguage)
return;
QString binary = sp->executable;
......
......@@ -90,6 +90,7 @@ public:
startMode(NoStartMode),
closeMode(KillAtClose),
useCtrlCStub(false),
skipExecutableValidation(false),
testCase(0)
{}
......@@ -157,6 +158,9 @@ public:
QString remoteExecutable;
bool useCtrlCStub;
// Used by Android to avoid false positives on warnOnRelease
bool skipExecutableValidation;
// For Debugger testing.
int testCase;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment