diff options
| author | Alan Leung <acleung@google.com> | 2017-10-20 13:36:29 -0700 |
|---|---|---|
| committer | Alan Leung <acleung@google.com> | 2017-10-27 11:51:01 -0700 |
| commit | 899f3742b87cfab4632b81e7a371299630cc2427 (patch) | |
| tree | 5405cd8c65601294cb552bce791b69bfb7ebe382 /java | |
| parent | 3ae6d308040feaf5a25bc8eb94a8076380024d85 (diff) | |
| download | build_soong-899f3742b87cfab4632b81e7a371299630cc2427.tar.gz build_soong-899f3742b87cfab4632b81e7a371299630cc2427.tar.bz2 build_soong-899f3742b87cfab4632b81e7a371299630cc2427.zip | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/config/config.go b/java/config/config.go index 85a753c6..c19a705c 100644 --- 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 |