feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
This commit is contained in:
Eike Ziller
2018-07-10 07:44:53 +02:00
parent d20464d56f 3300182d40
commit d09b71d260
31 changed files with 369 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidconfigurations.cpp
View File

@@ -416,6 +416,17 @@ FileName AndroidConfig::avdManagerToolPath() const
return avdManagerPath;
}
FileName AndroidConfig::aaptToolPath() const
{
Utils::FileName aaptToolPath = m_sdkLocation;
aaptToolPath.appendPath("build-tools");
QString toolPath = QString("%1/aapt").arg(buildToolsVersion().toString());
if (HostOsInfo::isWindowsHost())
toolPath += ANDROID_BAT_SUFFIX;
aaptToolPath.appendPath(toolPath);
return aaptToolPath;
}
FileName AndroidConfig::gccPath(const Abi &abi, Core::Id lang,
const QString &ndkToolChainVersion) const
{