Use D8 by default
The min-sdk-version issue is solved.
Same goes for the ART layout gtests failure found on the art host bots.
Bug: 67569208
Test: m checkbuild / tests
Change-Id: I88c7f5e9ea5c5c5d1b13404ba5db1479f9f7f2f7
diff --git a/java/config/config.go b/java/config/config.go
index 85a753c..c19a705 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -80,9 +80,9 @@
pctx.HostBinToolVariable("SoongZipCmd", "soong_zip")
pctx.HostBinToolVariable("MergeZipsCmd", "merge_zips")
pctx.VariableFunc("DxCmd", func(config interface{}) (string, error) {
- dexer := "dx"
- if config.(android.Config).Getenv("USE_D8") == "true" {
- dexer = "d8"
+ dexer := "d8"
+ if config.(android.Config).IsEnvFalse("USE_D8") {
+ dexer = "dx"
}
if config.(android.Config).UnbundledBuild() || config.(android.Config).IsPdkBuild() {
return "prebuilts/build-tools/common/bin/" + dexer, nil