diff options
| author | 2018-01-03 20:50:50 +0000 | |
|---|---|---|
| committer | 2018-01-03 20:50:50 +0000 | |
| commit | a5fcf862ce3706372f9d7740fbd35d22cf6841a4 (patch) | |
| tree | b549ff7fbd91bc2974405299e44658d36de37940 /java/java.go | |
| parent | 82d1aee779b4e8c1c7bfb963cdf8ff38ed0bfb24 (diff) | |
| parent | e6ddff68be6b76cbae935f9a5125549327a66111 (diff) | |
Merge "Move jacoco before desugar"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 8159af850..7daa8f2ef 100644 --- a/java/java.go +++ b/java/java.go @@ -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() { |