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

Merge "Move jacoco before desugar" am: a5fcf862ce

Browse Source 
am: 550a5f6de5

Change-Id: I8ec088e92fc8247cf3bc33e4c876405ee1864db5
This commit is contained in:
Colin Cross
2018-01-03 21:01:15 +00:00
committed by android-build-merger
parent 3daf7a1e09 550a5f6de5
commit 239bbedf8e
1 changed files with 1 additions and 4 deletions
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 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 ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {
if inList(ctx.ModuleName(), config.InstrumentFrameworkModules) { if inList(ctx.ModuleName(), config.InstrumentFrameworkModules) {
j.properties.Instrument = true j.properties.Instrument = true
@@ -847,6 +843,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
if fullD8 { if fullD8 {
outputFile = j.compileDexFullD8(ctx, flags, outputFile, jarName) outputFile = j.compileDexFullD8(ctx, flags, outputFile, jarName)
} else { } else {
outputFile = j.desugar(ctx, flags, outputFile, jarName)
outputFile = j.compileDex(ctx, flags, outputFile, jarName) outputFile = j.compileDex(ctx, flags, outputFile, jarName)
} }
if ctx.Failed() { if ctx.Failed() {