feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Remove unnecessary parameters in AndroidConfigurations

Browse Source 
No need to manually provide a parameter to adbToolPath inside
AndroidConfigurations itself, functions that needs it can just
get it directly.

Change-Id: Ie319e82e4ea3b7e3ad6588284168f6116bef2686
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-10-06 22:24:52 +03:00
parent 6e4d829a40
commit 336cee445e
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidconfigurations.h
View File

@@ -145,7 +145,6 @@ public:
Utils::FilePath keytoolPath() const;
QVector<AndroidDeviceInfo> connectedDevices(QString *error = nullptr) const;
static QVector<AndroidDeviceInfo> connectedDevices(const Utils::FilePath &adbToolPath, QString *error = nullptr);
QString bestNdkPlatformMatch(int target, const QtSupport::BaseQtVersion *qtVersion) const;
@@ -172,17 +171,16 @@ public:
void setOpenSslLocation(const Utils::FilePath &openSslLocation);
static Utils::FilePath getJdkPath();
static QStringList getAbis(const Utils::FilePath &adbToolPath, const QString &device);
static QStringList getAbis(const QString &device);
QString getRunningAvdsSerialNumber(const QString &name) const;
static QStringList getRunningAvdsFromDevices(const QVector<AndroidDeviceInfo> &devs);
private:
static QString getDeviceProperty(const Utils::FilePath &adbToolPath,
const QString &device, const QString &property);
static QString getDeviceProperty(const QString &device, const QString &property);
Utils::FilePath openJDKBinPath() const;
static int getSDKVersion(const Utils::FilePath &adbToolPath, const QString &device);
static int getSDKVersion(const QString &device);
static QString getAvdName(const QString &serialnumber);
void parseDependenciesJson();