diff options
| author | Alan Leung <acleung@google.com> | 2017-11-30 15:50:39 -0800 |
|---|---|---|
| committer | Alan Leung <acleung@google.com> | 2017-12-11 16:05:51 -0800 |
| commit | 9f319118e14989a0c9d3a3779eba1750bee7e002 (patch) | |
| tree | fed9e703de5aaeaa456b4caf63d0e29b8059c838 /java/config | |
| parent | d4c03092cd04e1c2963e5cbf3fd6b79c6fe2d330 (diff) | |
| download | build_soong-9f319118e14989a0c9d3a3779eba1750bee7e002.tar.gz build_soong-9f319118e14989a0c9d3a3779eba1750bee7e002.tar.bz2 build_soong-9f319118e14989a0c9d3a3779eba1750bee7e002.zip | |
Add USE_D8_DESUGAR option in build/soong
Add an option to use D8's desugar instead of the standalone version.
USE_D8_DESUGAR=true m would trigger DCHECK in dex2oat unless
https://android-review.googlesource.com/c/platform/art/+/562595 is
patched in as well.
Bug: 69329508
Test: m && USE_D8_DESUGAR=false m
Change-Id: I864d88e257a2ba0b7f19aa5cced537301950e963
Diffstat (limited to 'java/config')
| -rw-r--r-- | java/config/config.go | 7 | ||||
| -rw-r--r-- | java/config/makevars.go | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/java/config/config.go b/java/config/config.go index ad2f0aee..c43f9a38 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -106,6 +106,13 @@ func init() { return path.String(), nil } }) + pctx.VariableFunc("D8Cmd", func(config android.Config) (string, error) { + path, err := pctx.HostBinToolPath(config, "d8") + if err != nil { + return "", err + } + return path.String(), nil + }) pctx.VariableFunc("TurbineJar", func(config android.Config) (string, error) { turbine := "turbine.jar" if config.UnbundledBuild() { diff --git a/java/config/makevars.go b/java/config/makevars.go index dc9a91b2..5c8589e1 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -45,8 +45,15 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("JAR_ARGS", "${JarArgsCmd}") ctx.Strict("JAVADOC", "${JavadocCmd}") ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}") - ctx.Strict("DX", "${DxCmd}") - ctx.Strict("DX_COMMAND", "${DxCmd} -JXms16M -JXmx2048M") + + if ctx.Config().IsEnvTrue("USE_D8_DESUGAR") { + ctx.Strict("DX", "${D8Cmd}") + ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M") + } else { + ctx.Strict("DX", "${DxCmd}") + ctx.Strict("DX_COMMAND", "${DxCmd} -JXms16M -JXmx2048M") + } + ctx.Strict("TURBINE", "${TurbineJar}") if ctx.Config().IsEnvTrue("RUN_ERROR_PRONE") { |