commit 19a7f251d382ad5248836b204315db6c31804db7
author Jiyong Park <jiyong@google.com> Wed Jul 10 16:59:31 2019 +0900
committer Jiyong Park <jiyong@google.com> Fri Jul 19 11:31:31 2019 +0900
tree 90fe95efd8820c79486eba9935d7f108c2eabe3a
parent 2907459e430f0cba0257badcc038817a73d570f3

aidl include paths are exported to droiddoc

This change fixes a bug that aidl include paths are not exported when a
java lib is used by a droiddoc module.

Bug: 135922046
Test: N/A
Change-Id: I367695677f60bfb4f324b788c7d09cd926cb75bb

java/droiddoc.go

diff --git a/java/droiddoc.go b/java/droiddoc.go
index ae810e1..6de2ddf 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -655,6 +655,7 @@
 				deps.classpath = append(deps.classpath, dep.SdkImplementationJars(ctx, j.sdkVersion())...)
 			case Dependency:
 				deps.classpath = append(deps.classpath, dep.HeaderJars()...)
+				deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs()...)
 			case android.SourceFileProducer:
 				checkProducesJars(ctx, dep)
 				deps.classpath = append(deps.classpath, dep.Srcs()...)