diff options
| author | Colin Cross <ccross@android.com> | 2017-12-22 16:53:21 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-01-02 18:23:43 -0800 |
| commit | e6ddff68be6b76cbae935f9a5125549327a66111 (patch) | |
| tree | 64a68201f4b5381858a299c6a57b137a2d159d98 /java/java.go | |
| parent | 7fdd2b788c760ea48e20f330ea5860d6a14c625c (diff) | |
| download | build_soong-e6ddff68be6b76cbae935f9a5125549327a66111.tar.gz build_soong-e6ddff68be6b76cbae935f9a5125549327a66111.tar.bz2 build_soong-e6ddff68be6b76cbae935f9a5125549327a66111.zip | |
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
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 8159af85..7daa8f2e 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() { |