From 649dadfb8759ef1fc4f9c9ddb9221a6c2f6a8cdf Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 26 May 2020 11:42:13 +0100 Subject: [PATCH] Switch droiddoc to use SdkHeaderJars() Previously, droiddoc was using SdkImplementationJars() to get a JAR to add to the classpath in order to resolve unknown references in the source. Given that SdkHeaderJars() returns jars created by Turbine which are (for compilation at least) functionally identical to the implementation jars there is no point in using the implementation jars. Bug: 148080325 Test: m nothing Change-Id: I2b718cc1445c04e849dcb0b1f53bba2b0bd90c95 --- java/droiddoc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/droiddoc.go b/java/droiddoc.go index a5a678522..821bb6d7d 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -546,7 +546,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { case libTag: switch dep := module.(type) { case SdkLibraryDependency: - deps.classpath = append(deps.classpath, dep.SdkImplementationJars(ctx, j.sdkVersion())...) + deps.classpath = append(deps.classpath, dep.SdkHeaderJars(ctx, j.sdkVersion())...) case Dependency: deps.classpath = append(deps.classpath, dep.HeaderJars()...) deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs()...)