Merge changes from topic "docs_circular_dep"

am: b1469d53e7 Change-Id: Ib4bc02cf4301f2984ce9d938bc794bd1a8a987ed
2019-07-19 04:51:35 -07:00 · 2019-07-19 04:51:35 -07:00 · af3b940041
parent f35b561d95 b1469d53e7
commit af3b940041
1 changed files with 1 additions and 0 deletions
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@ -655,6 +655,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
 				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()...)