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

Fix Android plugin.

Browse Source 
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
BogDan Vatra
2012-06-23 12:24:44 +03:00
committed by Tobias Hunger
parent a1d4afad67
commit bb0573a8aa
12 changed files with 183 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -152,15 +152,17 @@ bool AndroidPackageCreationStep::init()
// Copying
m_androidDir = AndroidManager::dirPath(target());
Utils::FileName path = m_androidDir;
Utils::FileName androidLibPath;
if (project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("x86")))
androidLibPath = m_androidDir.appendPath(QLatin1String("libs/x86"));
androidLibPath = path.appendPath(QLatin1String("libs/x86"));
else if (project->rootQt4ProjectNode()
->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("armeabi-v7a")))
androidLibPath = m_androidDir.appendPath(QLatin1String("libs/armeabi-v7a"));
androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a"));
else
androidLibPath = m_androidDir.appendPath(QLatin1String("libs/armeabi"));
m_gdbServerDestination = androidLibPath.appendPath(QLatin1String("gdbserver"));
androidLibPath = path.appendPath(QLatin1String("libs/armeabi"));
path = m_androidDir;
m_gdbServerDestination = path.appendPath(QLatin1String("gdbserver"));
m_gdbServerSource = AndroidConfigurations::instance().gdbServerPath(target()->activeRunConfiguration()->abi().architecture());
m_debugBuild = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;