Merge "Use D8 by default"

am: 5bab222432 Change-Id: Ic1fb8159ac74c40ba468d7208b11c80cc32b351a
2017-10-27 21:34:37 +00:00
parent 4b26316680 5bab222432
commit f863d380c9
1 changed files with 3 additions and 3 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -80,9 +80,9 @@ func init() {
 	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