diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-09-08 23:36:13 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-09-14 09:01:12 +0000 |
| commit | 027383814a8cb649bd52d4f26fa261fc6bc3dd88 (patch) | |
| tree | edfd806ebd40a7ac33c6d0b8540cea91cf51387e /src/plugins/qmakeandroidsupport | |
| parent | f4a8f52b0d073ad3d730da4a864f48bd267c0edf (diff) | |
| download | qt-creator-027383814a8cb649bd52d4f26fa261fc6bc3dd88.tar.gz | |
Android: Remove Ant and make gradle as the default java build tool
All GUI options to choose between ant and gradle are removed.
Gradle is the only java build tool used now.
Change-Id: I309ff66256c5d40920a5d77a8331c5917c53c185
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/qmakeandroidsupport')
| -rw-r--r-- | src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp index ef87c84ef0..c7d0db210b 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp @@ -88,12 +88,8 @@ bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps m_androidDirsToClean.clear(); // don't remove gradle's cache, it takes ages to rebuild it. - if (!QFile::exists(dirPath + "/build.xml") && Android::AndroidManager::useGradle(target())) { - m_androidDirsToClean << dirPath + "/assets"; - m_androidDirsToClean << dirPath + "/libs"; - } else { - m_androidDirsToClean << dirPath; - } + m_androidDirsToClean << dirPath + "/assets"; + m_androidDirsToClean << dirPath + "/libs"; return AbstractProcessStep::init(earlierSteps); } diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index f9fe6758c0..68e3e1d632 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -172,11 +172,7 @@ bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) if (m_verbose) arguments << "--verbose"; - if (m_useGradle) - arguments << "--gradle"; - else - arguments << "--ant" << AndroidConfigurations::currentConfig().antToolPath().toString(); - + arguments << "--gradle"; QStringList argumentsPasswordConcealed = arguments; |