Prep D8 default instead of CompatDX in build/soong

Bug: 69329508 Test: m checkbuild tests Change-Id: Ibaa2d787c644cf25104af78305a6eed16028dcf0
2017-12-13 00:28:49 -08:00
parent b267295324
commit c37c6343e2
4 changed files with 9 additions and 3 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -677,7 +677,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 	// Store the list of .java files that was passed to javac
 	j.compiledJavaSrcs = uniqueSrcFiles
 	j.compiledSrcJars = srcJars
-	fullD8 := ctx.AConfig().IsEnvTrue("USE_D8_DESUGAR")
+	fullD8 := ctx.Config().UseD8Desugar()

 	enable_sharding := false
 	if ctx.Device() && !ctx.Config().IsEnvFalse("TURBINE_ENABLED") {