Revert -Xmx back to 1536M; enable tiered compilation am: cf3444c2dc
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2147924
Change-Id: If6e15c9eae647db7ec457a7ba3fe25611471c81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java
index e9a9701..c591803 100644
--- a/src/vogar/android/AndroidSdk.java
+++ b/src/vogar/android/AndroidSdk.java
@@ -385,7 +385,8 @@
switch (dexer) {
case DX:
builder.args(DX_COMMAND_NAME);
- builder.args("-JXms16M").args("-JXmx1792M");
+ builder.args("-JXms16M").args("-JXmx1536M");
+ builder.args("-JXX:+TieredCompilation").args("-JXX:TieredStopAtLevel=1");
builder.args("--min-sdk-version=" + language.getMinApiLevel());
if (multidex) {
builder.args("--multi-dex");
@@ -404,7 +405,8 @@
throw new RuntimeException("Error while removing dex files from archive", e);
}
builder.args(D8_COMMAND_NAME);
- builder.args("-JXms16M").args("-JXmx1792M");
+ builder.args("-JXms16M").args("-JXmx1536M");
+ builder.args("-JXX:+TieredCompilation").args("-JXX:TieredStopAtLevel=1");
// d8 will not allow compiling with a single dex file as the target, but if given
// a directory name will start its output in classes.dex but may overflow into
