diff options
| author | 2018-04-19 18:33:31 +0000 | |
|---|---|---|
| committer | 2018-04-19 18:33:31 +0000 | |
| commit | dcbc89a3abda98de356ead428deb563579fedce8 (patch) | |
| tree | 78b191b295a435a094b2ac4f27f24f384f0a76ea /java/java.go | |
| parent | 94853de469a57ee9bf745dea0380bbc48757271f (diff) | |
| parent | c678ad3f7143291458d053bd7094301aff15d873 (diff) | |
Merge "Adding java_sdk_library"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 277cdafd9..8c2312476 100644 --- a/java/java.go +++ b/java/java.go @@ -292,6 +292,10 @@ type Dependency interface { AidlIncludeDirs() android.Paths } +type SdkLibraryDependency interface { + HeaderJars(linkType linkType) android.Paths +} + type SrcDependency interface { CompiledSrcs() android.Paths CompiledSrcJars() android.Paths @@ -729,6 +733,13 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { } deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs()...) + case SdkLibraryDependency: + switch tag { + case libTag: + deps.classpath = append(deps.classpath, dep.HeaderJars(getLinkType(j, ctx.ModuleName()))...) + default: + ctx.ModuleErrorf("dependency on java_sdk_library %q can only be in libs", otherName) + } case android.SourceFileProducer: switch tag { case libTag: |