commit 1d476fcbeb8b6cb1d7643e8673930bffa664685e
author Alan Leung <acleung@google.com> Tue Oct 17 18:50:50 2017 -0700
committer Alan Leung <acleung@google.com> Thu Oct 19 16:27:42 2017 -0700
tree cedf093362ff14aa419d58f15a485b40df110380
parent 31b59cf6041fa8c6d7c8a74ebec14c6618bc49ae

Add D8 support

Bug: 67754178
Test: m -j32 checkbuild && USE_D8=true m -j32 checkbuild

Change-Id: If63afc10ceb5e753bbb7f195bb8a895eaef10775

java/config/makevars.go

diff --git a/java/config/makevars.go b/java/config/makevars.go
index 6b49592..2735242 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -43,6 +43,8 @@
 	ctx.Strict("JAR_ARGS", "${JarArgsCmd}")
 	ctx.Strict("JAVADOC", "${JavadocCmd}")
 	ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}")
+	ctx.Strict("DX", "${DxCmd}")
+	ctx.Strict("DX_COMMAND", "${DxCmd} -JXms16M -JXmx2048M")
 
 	if ctx.Config().IsEnvTrue("RUN_ERROR_PRONE") {
 		ctx.Strict("TARGET_JAVAC", "${ErrorProneCmd}")