зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1727438 - Increase java max heap to 32G. r=nalexander,owlish
Looks like 6G is not enough for an ASAN build when updating the gradle version. I tried 8G and 16G on try but that's not enough either. This also: * Moves the asan job to `b-linux-large` as the `b-linux` builder does not have enough memory to run this build. * Stops running a full build during lints, which is not necessary (and sometimes uses more memory than the build runner has, failing the lint). Differential Revision: https://phabricator.services.mozilla.com/D123970
This commit is contained in:
Родитель
aa6cf4b3d4
Коммит
8b804e3125
|
@ -1,4 +1,4 @@
|
|||
org.gradle.parallel=true
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xmx6656M
|
||||
org.gradle.jvmargs=-Xmx32768M
|
||||
android.useAndroidX=true
|
||||
|
|
|
@ -12,6 +12,9 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
dexOptions {
|
||||
javaMaxHeapSize "32g"
|
||||
}
|
||||
defaultConfig {
|
||||
applicationId "org.mozilla.geckoview.example.messaging"
|
||||
targetSdkVersion project.ext.targetSdkVersion
|
||||
|
|
|
@ -12,6 +12,9 @@ android {
|
|||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
dexOptions {
|
||||
javaMaxHeapSize "32g"
|
||||
}
|
||||
defaultConfig {
|
||||
applicationId "org.mozilla.geckoview.example.messaging"
|
||||
targetSdkVersion project.ext.targetSdkVersion
|
||||
|
|
|
@ -137,7 +137,7 @@ android {
|
|||
}
|
||||
|
||||
dexOptions {
|
||||
javaMaxHeapSize "6g"
|
||||
javaMaxHeapSize "32g"
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
|
|
|
@ -26,7 +26,7 @@ android {
|
|||
}
|
||||
|
||||
dexOptions {
|
||||
javaMaxHeapSize "6g"
|
||||
javaMaxHeapSize "32g"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Per https://docs.gradle.org/current/userguide/build_environment.html, this
|
||||
// overrides the gradle.properties in topsrcdir.
|
||||
org.gradle.daemon=false
|
||||
org.gradle.jvmargs=-Xmx6656M
|
||||
org.gradle.jvmargs=-Xmx32768M
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Per https://docs.gradle.org/current/userguide/build_environment.html, this
|
||||
// overrides the gradle.properties in topsrcdir.
|
||||
org.gradle.daemon=false
|
||||
org.gradle.jvmargs=-Xmx6656M
|
||||
org.gradle.jvmargs=-Xmx32768M
|
||||
|
|
|
@ -915,7 +915,7 @@ android-x86_64-asan-fuzzing/opt:
|
|||
treeherder:
|
||||
platform: android-5-0-x86_64/asan
|
||||
symbol: Bof
|
||||
worker-type: b-linux
|
||||
worker-type: b-linux-large
|
||||
worker:
|
||||
env:
|
||||
TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
|
||||
|
|
|
@ -64,7 +64,7 @@ lints:
|
|||
ln -s $MOZ_FETCHES_DIR/android-sdk-linux $GECKO_PATH &&
|
||||
ln -s $MOZ_FETCHES_DIR/node $GECKO_PATH &&
|
||||
cd $GECKO_PATH &&
|
||||
./mach --log-no-times build &&
|
||||
./mach --log-no-times build pre-export export &&
|
||||
./mach --log-no-times lint -f treeherder -f json:/builds/worker/mozlint.json
|
||||
--linter android-api-lint
|
||||
--linter android-javadoc
|
||||
|
|
Загрузка…
Ссылка в новой задаче