diff options
| author | Colin Cross <ccross@android.com> | 2018-01-03 15:59:46 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-01-03 16:02:47 -0800 |
| commit | 84c3882e649ed15db8a30a4acdbeed26f9304f06 (patch) | |
| tree | ba92cb830a0f0592378e24d2dbc4f43b036737ce /java/java.go | |
| parent | 66dbc0bc32100d9696dd248018683128a1274016 (diff) | |
Fix jacoco_cli invocation
jacoco_cli --dest takes a directory, not a jar name, and assumes
an output file with the same name as the input jar in that
directory. Rename jacoco-report-classes.jar to
jacoco-report-classes/modulename.jar, and generate to
jacoco/tmp/modulename.jar before combining to the final output file
at jacoco/modulename.jar.
Bug: 69669951
Test: m EMMA_INSTRUMENT=true
Change-Id: Ia7dd881d2819ae09dfb60a00b4c1b8396629cd9a
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 106284e0c..24debacd8 100644 --- a/java/java.go +++ b/java/java.go @@ -929,7 +929,7 @@ func (j *Module) instrument(ctx android.ModuleContext, flags javaBuilderFlags, specs := j.jacocoModuleToZipCommand(ctx) - jacocoReportClassesFile := android.PathForModuleOut(ctx, "jacoco", "jacoco-report-classes.jar") + jacocoReportClassesFile := android.PathForModuleOut(ctx, "jacoco-report-classes", jarName) instrumentedJar := android.PathForModuleOut(ctx, "jacoco", jarName) jacocoInstrumentJar(ctx, instrumentedJar, jacocoReportClassesFile, classesJar, specs) |