Commit 88ac76fb authored by BogDan Vatra's avatar BogDan Vatra Committed by Eskil Abrahamsen Blomfeldt

Add MIPS support for Android.

Change-Id: I6b533543a998e04b3496ce2eb480bc0ee14dcbb7
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 34692eea
......@@ -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;
}
......
......@@ -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"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment