Fix a bug where jacoco-report-classes files were missing.
Bug: 395914875
Test: ABTD and compare local ninja and mk files.
Change-Id: I2cb796b0a773f40a634881e53a8a61a5e0d828cc
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 7944bb2..0fee529 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1580,7 +1580,9 @@
setOutputFilesFromJavaInfo(ctx, module.implLibraryInfo)
}
- javaInfo := &JavaInfo{}
+ javaInfo := &JavaInfo{
+ JacocoReportClassesFile: module.jacocoReportClassesFile,
+ }
setExtraJavaInfo(ctx, ctx.Module(), javaInfo)
android.SetProvider(ctx, JavaInfoProvider, javaInfo)
@@ -2240,6 +2242,10 @@
}
javaInfo := &JavaInfo{}
+ if module.implLibraryInfo != nil {
+ javaInfo.JacocoReportClassesFile = module.implLibraryInfo.JacocoReportClassesFile
+ }
+
setExtraJavaInfo(ctx, ctx.Module(), javaInfo)
android.SetProvider(ctx, JavaInfoProvider, javaInfo)