Skip to content
Snippets Groups Projects
Commit 88ac76fb authored by BogDan Vatra's avatar BogDan Vatra Committed by Eskil Abrahamsen Blomfeldt
Browse files

Add MIPS support for Android.


Change-Id: I6b533543a998e04b3496ce2eb480bc0ee14dcbb7
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 34692eea
No related branches found
No related tags found
No related merge requests found
...@@ -71,8 +71,10 @@ namespace { ...@@ -71,8 +71,10 @@ namespace {
const QLatin1String PartitionSizeKey("PartitionSize"); const QLatin1String PartitionSizeKey("PartitionSize");
const QLatin1String ArmToolchainPrefix("arm-linux-androideabi"); const QLatin1String ArmToolchainPrefix("arm-linux-androideabi");
const QLatin1String X86ToolchainPrefix("x86"); const QLatin1String X86ToolchainPrefix("x86");
const QLatin1String MipsToolchainPrefix("mipsel-linux-android");
const QLatin1String ArmToolsPrefix("arm-linux-androideabi"); const QLatin1String ArmToolsPrefix("arm-linux-androideabi");
const QLatin1String X86ToolsPrefix("i686-linux-android"); const QLatin1String X86ToolsPrefix("i686-linux-android");
const QLatin1String MipsToolsPrefix("mipsel-linux-android");
const QLatin1String Unknown("unknown"); const QLatin1String Unknown("unknown");
const QLatin1String keytoolName("keytool"); const QLatin1String keytoolName("keytool");
const QLatin1String jarsignerName("jarsigner"); const QLatin1String jarsignerName("jarsigner");
...@@ -96,6 +98,8 @@ Abi::Architecture AndroidConfigurations::architectureForToolChainPrefix(const QS ...@@ -96,6 +98,8 @@ Abi::Architecture AndroidConfigurations::architectureForToolChainPrefix(const QS
return Abi::ArmArchitecture; return Abi::ArmArchitecture;
if (toolchainprefix == X86ToolchainPrefix) if (toolchainprefix == X86ToolchainPrefix)
return Abi::X86Architecture; return Abi::X86Architecture;
if (toolchainprefix == MipsToolchainPrefix)
return Abi::MipsArchitecture;
return Abi::UnknownArchitecture; return Abi::UnknownArchitecture;
} }
...@@ -106,6 +110,8 @@ QLatin1String AndroidConfigurations::toolchainPrefix(Abi::Architecture architect ...@@ -106,6 +110,8 @@ QLatin1String AndroidConfigurations::toolchainPrefix(Abi::Architecture architect
return ArmToolchainPrefix; return ArmToolchainPrefix;
case Abi::X86Architecture: case Abi::X86Architecture:
return X86ToolchainPrefix; return X86ToolchainPrefix;
case Abi::MipsArchitecture:
return MipsToolchainPrefix;
default: default:
return Unknown; return Unknown;
} }
...@@ -118,6 +124,8 @@ QLatin1String AndroidConfigurations::toolsPrefix(Abi::Architecture architecture) ...@@ -118,6 +124,8 @@ QLatin1String AndroidConfigurations::toolsPrefix(Abi::Architecture architecture)
return ArmToolsPrefix; return ArmToolsPrefix;
case Abi::X86Architecture: case Abi::X86Architecture:
return X86ToolsPrefix; return X86ToolsPrefix;
case Abi::MipsArchitecture:
return MipsToolsPrefix;
default: default:
return Unknown; return Unknown;
} }
......
...@@ -146,10 +146,12 @@ bool AndroidPackageCreationStep::init() ...@@ -146,10 +146,12 @@ bool AndroidPackageCreationStep::init()
m_androidDir = AndroidManager::dirPath(target()); m_androidDir = AndroidManager::dirPath(target());
Utils::FileName path = m_androidDir; Utils::FileName path = m_androidDir;
Utils::FileName androidLibPath; 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")); androidLibPath = path.appendPath(QLatin1String("libs/x86"));
else if (project->rootQt4ProjectNode() else if (configs.contains(QLatin1String("mips")))
->variableValue(Qt4ProjectManager::ConfigVar).contains(QLatin1String("armeabi-v7a"))) androidLibPath = path.appendPath(QLatin1String("libs/mips"));
else if (configs.contains(QLatin1String("armeabi-v7a")))
androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a")); androidLibPath = path.appendPath(QLatin1String("libs/armeabi-v7a"));
else else
androidLibPath = path.appendPath(QLatin1String("libs/armeabi")); androidLibPath = path.appendPath(QLatin1String("libs/armeabi"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment