diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 8 | ||||
-rw-r--r-- | src/plugins/android/androidpackagecreationstep.cpp | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 2642576c43..c1b44b0e67 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -71,8 +71,10 @@ namespace { const QLatin1String PartitionSizeKey("PartitionSize"); const QLatin1String ArmToolchainPrefix("arm-linux-androideabi"); const QLatin1String X86ToolchainPrefix("x86"); + const QLatin1String MipsToolchainPrefix("mipsel-linux-android"); const QLatin1String ArmToolsPrefix("arm-linux-androideabi"); const QLatin1String X86ToolsPrefix("i686-linux-android"); + const QLatin1String MipsToolsPrefix("mipsel-linux-android"); const QLatin1String Unknown("unknown"); const QLatin1String keytoolName("keytool"); const QLatin1String jarsignerName("jarsigner"); @@ -96,6 +98,8 @@ Abi::Architecture AndroidConfigurations::architectureForToolChainPrefix(const QS return Abi::ArmArchitecture; if (toolchainprefix == X86ToolchainPrefix) return Abi::X86Architecture; + if (toolchainprefix == MipsToolchainPrefix) + return Abi::MipsArchitecture; return Abi::UnknownArchitecture; } @@ -106,6 +110,8 @@ QLatin1String AndroidConfigurations::toolchainPrefix(Abi::Architecture architect return ArmToolchainPrefix; case Abi::X86Architecture: return X86ToolchainPrefix; + case Abi::MipsArchitecture: + return MipsToolchainPrefix; default: return Unknown; } @@ -118,6 +124,8 @@ QLatin1String AndroidConfigurations::toolsPrefix(Abi::Architecture architecture) return ArmToolsPrefix; case Abi::X86Architecture: return X86ToolsPrefix; + case Abi::MipsArchitecture: + return MipsToolsPrefix; default: return Unknown; } 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")); |