Read ANDROID_TARGET_ARCH instead of CONFIG

Instead of adding single archs like x86 to the general CONFIG
variable, we can read the ANDROID_TARGET_ARCH directly in
Qt Creator.

Change-Id: Idc4c4524d0f277aad8e129ca622d64d505a5ac95
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

src/plugins/android/androidpackagecreationstep.cpp

@@ -145,16 +145,13 @@ bool AndroidPackageCreationStep::init()
     // Copying
     m_androidDir = AndroidManager::dirPath(target());
     Utils::FileName path = m_androidDir;
-    Utils::FileName androidLibPath;
-    QStringList configs = project->rootQt4ProjectNode()->variableValue(Qt4ProjectManager::ConfigVar);
-    if (configs.contains(QLatin1String("x86")))
-        androidLibPath = path.appendPath(QLatin1String("libs/x86"));
-    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"));
+    QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar);
+    if (androidTargetArch.isEmpty()) {
+        raiseError(tr("Cannot create Android package: No ANDROID_TARGET_ARCH set in make spec."));
+        return false;
+    }
+
+    Utils::FileName androidLibPath = path.appendPath(QLatin1String("libs/") + androidTargetArch);
     m_gdbServerDestination = androidLibPath.appendPath(QLatin1String("gdbserver"));
     m_gdbServerSource = AndroidGdbServerKitInformation::gdbServer(target()->kit());
     m_debugBuild = bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild;

src/plugins/qt4projectmanager/qt4nodes.cpp

@@ -1941,6 +1941,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
                 = m_readerExact->values(QLatin1String("TARGET_VERSION_EXT"));
         newVarValues[StaticLibExtensionVar] = m_readerExact->values(QLatin1String("QMAKE_EXTENSION_STATICLIB"));
         newVarValues[ShLibExtensionVar] = m_readerExact->values(QLatin1String("QMAKE_EXTENSION_SHLIB"));
+        newVarValues[AndroidArchVar] = m_readerExact->values(QLatin1String("ANDROID_TARGET_ARCH"));
 
         m_isDeployable = false;
         if (m_projectType == ApplicationTemplate) {

src/plugins/qt4projectmanager/qt4nodes.h

@@ -98,7 +98,8 @@ enum Qt4Variable {
     VersionVar,
     TargetVersionExtVar,
     StaticLibExtensionVar,
-    ShLibExtensionVar
+    ShLibExtensionVar,
+    AndroidArchVar
 };
 
 // Import base classes into namespace