diff options
| author | Colin Cross <ccross@android.com> | 2019-02-11 14:03:51 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-02-11 15:29:51 -0800 |
| commit | 897d2ed92f2575ab188cdac360564d608f66a438 (patch) | |
| tree | ea2a66882c032e73083bdc2b0a634eed0310522d /java/droiddoc.go | |
| parent | c7e40aa5782121a98897197df4cb57a0349f29c8 (diff) | |
| download | android_build_soong-897d2ed92f2575ab188cdac360564d608f66a438.tar.gz android_build_soong-897d2ed92f2575ab188cdac360564d608f66a438.tar.bz2 android_build_soong-897d2ed92f2575ab188cdac360564d608f66a438.zip | |
Make java_sdk_library implement Dependency
dexpreopting boot jars is going to need to visit both java_library
and java_sdk_library modules. Since java_sdk_library is already
a java_library module, move the SdkLibraryDependency methods out
of the way so that it will implement Dependency. Also requries
re-ording some of the type switches to check for the more-specific
SdkLibraryDependency first.
Test: TestJavaSdkLibrary
Change-Id: I155c9ffaf31689dd150a4d99e07e432ff770b4a7
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index d893c09a..cbe6be64 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -630,10 +630,10 @@ 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())...) case Dependency: deps.classpath = append(deps.classpath, dep.HeaderJars()...) - case SdkLibraryDependency: - deps.classpath = append(deps.classpath, dep.ImplementationJars(ctx, j.sdkVersion())...) case android.SourceFileProducer: checkProducesJars(ctx, dep) deps.classpath = append(deps.classpath, dep.Srcs()...) |