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

Android: Use minimum sdk instead of build target sdk to filter devices

Browse Source 
Task-number: QTCREATORBUG-9662
Change-Id: I3a5b3493bc8ef48bd23d014e86eef45185f3c17e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-08-28 15:23:04 +02:00
parent 307aa7b3aa
commit 31fe6f069c
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/android/androiddeploystep.cpp
View File

@@ -96,11 +96,14 @@ void AndroidDeployStep::ctor()
bool AndroidDeployStep::init() bool AndroidDeployStep::init()
{ {
m_packageName = AndroidManager::packageName(target()); m_packageName = AndroidManager::packageName(target());
const QString targetSDK = AndroidManager::buildTargetSDK(target()); m_deviceAPILevel = AndroidManager::minimumSDK(target());
m_targetArch = AndroidManager::targetArch(target()); m_targetArch = AndroidManager::targetArch(target());
writeOutput(tr("Please wait, searching for a suitable device for target:%1, ABI:%2").arg(targetSDK).arg(m_targetArch)); if (m_deviceAPILevel == 0) // minimum api level is unset
m_deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt(); writeOutput(tr("Please wait, searching for a suitable device for target: ABI:%2").arg(m_targetArch));
else
writeOutput(tr("Please wait, searching for a suitable device for target: API %1, ABI:%2").arg(m_deviceAPILevel).arg(m_targetArch));
QString error; QString error;
m_deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&m_deviceAPILevel, m_targetArch, &error); m_deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&m_deviceAPILevel, m_targetArch, &error);
if (!error.isEmpty()) if (!error.isEmpty())
@@ -196,10 +199,8 @@ QVariantMap AndroidDeployStep::toMap() const
void AndroidDeployStep::cleanLibsOnDevice() void AndroidDeployStep::cleanLibsOnDevice()
{ {
const QString targetSDK = AndroidManager::buildTargetSDK(target());
const QString targetArch = AndroidManager::targetArch(target()); const QString targetArch = AndroidManager::targetArch(target());
int deviceAPILevel = AndroidManager::minimumSDK(target());
int deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt();
QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel, targetArch); QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel, targetArch);
if (deviceSerialNumber.isEmpty()) { if (deviceSerialNumber.isEmpty()) {
QString avdName = AndroidConfigurations::instance().findAvd(&deviceAPILevel, targetArch); QString avdName = AndroidConfigurations::instance().findAvd(&deviceAPILevel, targetArch);
@@ -258,8 +259,7 @@ void AndroidDeployStep::kitUpdated(Kit *kit)
void AndroidDeployStep::installQASIPackage(const QString &packagePath) void AndroidDeployStep::installQASIPackage(const QString &packagePath)
{ {
const QString targetArch = AndroidManager::targetArch(target()); const QString targetArch = AndroidManager::targetArch(target());
const QString targetSDK = AndroidManager::buildTargetSDK(target()); int deviceAPILevel = AndroidManager::minimumSDK(target());
int deviceAPILevel = targetSDK.mid(targetSDK.indexOf(QLatin1Char('-')) + 1).toInt();
QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel, targetArch); QString deviceSerialNumber = AndroidConfigurations::instance().getDeployDeviceSerialNumber(&deviceAPILevel, targetArch);
if (deviceSerialNumber.isEmpty()) { if (deviceSerialNumber.isEmpty()) {
QString avdName = AndroidConfigurations::instance().findAvd(&deviceAPILevel, targetArch); QString avdName = AndroidConfigurations::instance().findAvd(&deviceAPILevel, targetArch);

18
src/plugins/android/androidmanager.cpp
View File

@@ -196,6 +196,24 @@ QString AndroidManager::activityName(ProjectExplorer::Target *target)
return activityElem.attribute(QLatin1String("android:name")); return activityElem.attribute(QLatin1String("android:name"));
} }
int AndroidManager::minimumSDK(ProjectExplorer::Target *target)
{
QDomDocument doc;
if (!openManifest(target, doc))
return 0;
QDomElement manifestElem = doc.documentElement();
QDomElement usesSdk = manifestElem.firstChildElement(QLatin1String("uses-sdk"));
if (usesSdk.isNull())
return 0;
if (usesSdk.hasAttribute(QLatin1String("android:minSdkVersion"))) {
bool ok;
int tmp = usesSdk.attribute(QLatin1String("android:minSdkVersion")).toInt(&ok);
if (ok)
return tmp;
}
return 0;
}
QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
{ {
QVariant v = target->namedSettings(QLatin1String("AndroidManager.TargetSdk")); QVariant v = target->namedSettings(QLatin1String("AndroidManager.TargetSdk"));

1
src/plugins/android/androidmanager.h
View File

@@ -74,6 +74,7 @@ public:
static QString buildTargetSDK(ProjectExplorer::Target *target); static QString buildTargetSDK(ProjectExplorer::Target *target);
static bool setBuildTargetSDK(ProjectExplorer::Target *target, const QString &sdk); static bool setBuildTargetSDK(ProjectExplorer::Target *target, const QString &sdk);
static int minimumSDK(ProjectExplorer::Target *target);
static QString targetArch(ProjectExplorer::Target *target); static QString targetArch(ProjectExplorer::Target *target);