forked from qt-creator/qt-creator
Android: Use adb:// in ConnectRemote
This is apparently the right thing to do anyway and also helps to
select the right emulator or device when multiple ones are connected.
In that situation otherwise an error
"Expected a single connected device, got instead 2 -
try setting 'ANDROID_SERIAL'"
would occur.
Change-Id: I650a221d1a321d4dd9035411f85c7a68244c20e2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
@@ -55,6 +55,7 @@ static Q_LOGGING_CATEGORY(androidDebugSupportLog, "qtc.android.run.androiddebugs
|
||||
|
||||
using namespace Debugger;
|
||||
using namespace ProjectExplorer;
|
||||
using namespace Utils;
|
||||
|
||||
namespace Android {
|
||||
namespace Internal {
|
||||
@@ -149,10 +150,17 @@ void AndroidDebugSupport::start()
|
||||
setUseExtendedRemote(true);
|
||||
QString devicePreferredAbi = AndroidManager::apkDevicePreferredAbi(target);
|
||||
setAbi(AndroidManager::androidAbi2Abi(devicePreferredAbi));
|
||||
|
||||
QUrl debugServer;
|
||||
debugServer.setHost(QHostAddress(QHostAddress::LocalHost).toString());
|
||||
debugServer.setPort(m_runner->debugServerPort().number());
|
||||
setRemoteChannel(debugServer);
|
||||
if (cppEngineType() == LldbEngineType) {
|
||||
debugServer.setScheme("adb");
|
||||
debugServer.setHost(AndroidManager::deviceSerialNumber(target));
|
||||
setRemoteChannel(debugServer.toString());
|
||||
} else {
|
||||
debugServer.setHost(QHostAddress(QHostAddress::LocalHost).toString());
|
||||
setRemoteChannel(debugServer);
|
||||
}
|
||||
|
||||
auto qt = static_cast<AndroidQtVersion *>(qtVersion);
|
||||
const int minimumNdk = qt ? qt->minimumNDK() : 0;
|
||||
|
||||
Reference in New Issue
Block a user