From 615b92008a7e6673bc74ec6e971a6bca5f5c81f6 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 15 Sep 2020 19:55:35 +0300
Subject: Android: remove --no-daemon arg for Gradle

Allow Gradle builds to run using JVM daemon, this will improve the
current build time noticeably for clean builds and hugely for
incremental builds.

This will bring the Gradle build to comparable speed with a normal
Gradle build in Android Studio.

Task-number: QTBUG-86674
Pick-to: 5.15
Change-Id: Icc4267223802e4c9350b48099236650c023f868d
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/3rdparty/gradle/CMakeLists.txt    | 1 +
 src/3rdparty/gradle/gradle.pro        | 3 ++-
 src/3rdparty/gradle/gradle.properties | 9 +++++++++
 src/android/templates/build.gradle    | 4 ++++
 src/tools/androiddeployqt/main.cpp    | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 src/3rdparty/gradle/gradle.properties

diff --git a/src/3rdparty/gradle/CMakeLists.txt b/src/3rdparty/gradle/CMakeLists.txt
index a6fbfc962a..20c0181403 100644
--- a/src/3rdparty/gradle/CMakeLists.txt
+++ b/src/3rdparty/gradle/CMakeLists.txt
@@ -6,6 +6,7 @@ qt_copy_or_install(
     FILES
         gradlew
         gradlew.bat
+        gradle.properties
     DESTINATION
         "${destination}"
 )
diff --git a/src/3rdparty/gradle/gradle.pro b/src/3rdparty/gradle/gradle.pro
index 1ff0db2017..5d8efdcfd3 100644
--- a/src/3rdparty/gradle/gradle.pro
+++ b/src/3rdparty/gradle/gradle.pro
@@ -4,7 +4,8 @@ CONFIG -= qt android_install
 
 gradle_files.files = \
     $$PWD/gradlew \
-    $$PWD/gradlew.bat
+    $$PWD/gradlew.bat \
+    $$PWD/gradle.properties
 gradle_dirs.files = \
     $$PWD/gradle
 
diff --git a/src/3rdparty/gradle/gradle.properties b/src/3rdparty/gradle/gradle.properties
new file mode 100644
index 0000000000..554f6aeba1
--- /dev/null
+++ b/src/3rdparty/gradle/gradle.properties
@@ -0,0 +1,9 @@
+# Project-wide Gradle settings.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+
+# Enable Gradle caching
+org.gradle.caching=true
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle
index d5b3b93499..c22cd80781 100644
--- a/src/android/templates/build.gradle
+++ b/src/android/templates/build.gradle
@@ -51,6 +51,10 @@ android {
        }
     }
 
+    tasks.withType(JavaCompile) {
+        options.incremental = true
+    }
+
     lintOptions {
         abortOnError false
     }
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 47a0667387..558e503973 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -2445,7 +2445,7 @@ bool buildAndroidProject(const Options &options)
         return false;
     }
 
-    QString commandLine = QLatin1String("%1 --no-daemon %2").arg(shellQuote(gradlePath), options.releasePackage ? QLatin1String(" assembleRelease") : QLatin1String(" assembleDebug"));
+    QString commandLine = QLatin1String("%1 %2").arg(shellQuote(gradlePath), options.releasePackage ? QLatin1String(" assembleRelease") : QLatin1String(" assembleDebug"));
     if (options.buildAAB)
         commandLine += QLatin1String(" bundle");
 
-- 
cgit v1.2.3