Merge "Always include the header jar file. The header jar file is used by JavacTool in Cider-G to resolve dependencies when producing diagnostics." into main
diff --git a/java/base.go b/java/base.go
index 6f9498e..d89c324 100644
--- a/java/base.go
+++ b/java/base.go
@@ -2230,6 +2230,8 @@
func (j *Module) IDEInfo(ctx android.BaseModuleContext, dpInfo *android.IdeInfo) {
if j.expandJarjarRules != nil {
dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String())
+ }
+ if j.headerJarFile != nil {
// Add the header jar so that the rdeps can be resolved to the repackaged classes.
dpInfo.Jars = append(dpInfo.Jars, j.headerJarFile.String())
}