StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove desugar support"

Browse Source 
This reverts commit 000280bb0e.

Reason for revert: broke art veridex build

Change-Id: I9f7d7cdbe8e34671614687ac0b34c0338ef240e7
This commit is contained in:
Colin Cross
2018-06-06 21:42:39 +00:00
parent 000280bb0e
commit 7576916efc
5 changed files with 138 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/config/makevars.go
View File

@@ -46,8 +46,15 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("JAVADOC", "${JavadocCmd}")
ctx.Strict("COMMON_JDK_FLAGS", "${CommonJdkFlags}")
ctx.Strict("DX", "${D8Cmd}")
ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M")
if ctx.Config().UseD8Desugar() {
ctx.Strict("DX", "${D8Cmd}")
ctx.Strict("DX_COMMAND", "${D8Cmd} -JXms16M -JXmx2048M")
ctx.Strict("USE_D8_DESUGAR", "true")
} else {
ctx.Strict("DX", "${DxCmd}")
ctx.Strict("DX_COMMAND", "${DxCmd} -JXms16M -JXmx2048M")
ctx.Strict("USE_D8_DESUGAR", "false")
}
ctx.Strict("R8_COMPAT_PROGUARD", "${R8Cmd}")
ctx.Strict("TURBINE", "${TurbineJar}")