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

Android: Check target architecture before deploying to device

Browse Source 
Change-Id: I2d05f98cb6c390fb84186929fdf4152cc07d8965
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-05-03 15:10:21 +02:00
parent c45e4e614a
commit c842d83f91
5 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
#include <QObject>
#include <QString>
#include <QStringList>
#include <QVector>
#include <projectexplorer/abi.h>
#include <utils/fileutils.h>
@@ -63,7 +64,7 @@ public:
struct AndroidDeviceInfo
{
QString serialNumber;
QString cpuABI;
QStringList cpuABI;
int sdk;
static QStringList adbSelector(const QString &serialNumber);
@@ -90,7 +91,7 @@ public:
Utils::FileName zipalignPath() const;
Utils::FileName stripPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const;
Utils::FileName readelfPath(ProjectExplorer::Abi::Architecture architecture, const QString &ndkToolChainVersion) const;
QString getDeployDeviceSerialNumber(int *apiLevel) const;
QString getDeployDeviceSerialNumber(int *apiLevel, const QString &abi) const;
bool createAVD(const QString &target, const QString &name, int sdcardSize) const;
bool removeAVD(const QString &name) const;
QVector<AndroidDeviceInfo> connectedDevices(int apiLevel = -1) const;
@@ -122,6 +123,7 @@ private:
void save();
int getSDKVersion(const QString &device) const;
QStringList getAbis(const QString &device) const;
void updateAvailablePlatforms();