Move jacoco before desugar
R8 will replace desugar+proguard+dx, which will mean jacoco has to
run before desugar. In preparation, move jacoco before desugar now.
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I5d98d2300ce83496f9b82c9b973f679701448474
diff --git a/java/java.go b/java/java.go
index 8159af8..7daa8f2 100644
--- a/java/java.go
+++ b/java/java.go
@@ -829,10 +829,6 @@
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 @@
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() {