Remove desugar support
Desugaring is always handled by d8 now.
Test: m checkbuild
Change-Id: I29e8f68e51b194a4090866acc63f19f0605e318d
diff --git a/java/config/makevars.go b/java/config/makevars.go
index 27c7daa..4dffa02 100644
--- a/java/config/makevars.go
+++ b/java/config/makevars.go
@@ -46,15 +46,8 @@
ctx.Strict("JAVADOC", "${JavadocCmd}")
ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}")
- if ctx.Config().UseD8Desugar() {
- ctx.Strict("DX", "${D8Cmd}")
- ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M")
- ctx.Strict("USE_D8_DESUGAR", "true")
- } else {
- ctx.Strict("DX", "${DxCmd}")
- ctx.Strict("DX_COMMAND", "${DxCmd} -JXms16M -JXmx2048M")
- ctx.Strict("USE_D8_DESUGAR", "false")
- }
+ ctx.Strict("DX", "${D8Cmd}")
+ ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M")
ctx.Strict("R8_COMPAT_PROGUARD", "${R8Cmd}")
ctx.Strict("TURBINE", "${TurbineJar}")