summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidpackagecreationstep.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android/androidpackagecreationstep.cpp')
-rw-r--r--src/plugins/android/androidpackagecreationstep.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index 0b27ffa1b0..5336764e4e 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -146,10 +146,12 @@ bool AndroidPackageCreationStep::init()
m_androidDir = AndroidManager::dirPath(target());
Utils::FileName path = m_androidDir;
Utils::FileName androidLibPath;
- if (project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("x86")))
+ QStringList configs = project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar);
+ if (configs.contains(QLatin1String("x86")))
androidLibPath = path.appendPath(QLatin1String("libs/x86"));
- else if (project->rootQt4ProjectNode()
- ->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("armeabi-v7a")))
+ else if (configs.contains(QLatin1String("mips")))
+ androidLibPath = path.appendPath(QLatin1String("libs/mips"));
+ else if (configs.contains(QLatin1String("armeabi-v7a")))
androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a"));
else
androidLibPath = path.appendPath(QLatin1String("libs/armeabi"));