tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move jacoco before desugar" am: a5fcf862ce am: 550a5f6de5

Browse source 
am: 239bbedf8e

Change-Id: I985cf2c64ee752b0797b97e0980de498e4f75315
This commit is contained in:
Colin Cross 2018-01-03 21:07:36 +00:00 committed by android-build-merger
commit 4a9861dd1e
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/java.go
View file

@ -829,10 +829,6 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
j.headerJarFile = j.implementationJarFile
}
if !fullD8 && ctx.Device() && j.installable() {
outputFile = j.desugar(ctx, flags, outputFile, jarName)
}
if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {
if inList(ctx.ModuleName(), config.InstrumentFrameworkModules) {
j.properties.Instrument = true
@ -847,6 +843,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
if fullD8 {
outputFile = j.compileDexFullD8(ctx, flags, outputFile, jarName)
} else {
outputFile = j.desugar(ctx, flags, outputFile, jarName)
outputFile = j.compileDex(ctx, flags, outputFile, jarName)
}
if ctx.Failed() {