Build: forked compiler max memory matches jvmArgs (#33138)
This commit removes the setting of the fork options maximum memory size in our build plugin and instead adds the value in the gradle.properties file to be alongside the value set in jvmArgs. This change is necessary when using parallel compilation as 512m is not sufficient for parallel compilation on some machines.
This commit is contained in:
parent
2aef7e0900
commit
309fb22181
|
@ -601,7 +601,6 @@ class BuildPlugin implements Plugin<Project> {
|
||||||
} else {
|
} else {
|
||||||
options.fork = true
|
options.fork = true
|
||||||
options.forkOptions.javaHome = compilerJavaHomeFile
|
options.forkOptions.javaHome = compilerJavaHomeFile
|
||||||
options.forkOptions.memoryMaximumSize = "512m"
|
|
||||||
}
|
}
|
||||||
if (targetCompatibilityVersion == JavaVersion.VERSION_1_8) {
|
if (targetCompatibilityVersion == JavaVersion.VERSION_1_8) {
|
||||||
// compile with compact 3 profile by default
|
// compile with compact 3 profile by default
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
org.gradle.jvmargs=-Xmx2g
|
org.gradle.jvmargs=-Xmx2g
|
||||||
|
options.forkOptions.memoryMaximumSize=2g
|
||||||
|
|
Loading…
Reference in New Issue