diff options
author | Paul Duffin <paulduffin@google.com> | 2020-10-06 17:20:13 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2020-10-06 17:48:37 +0100 |
commit | aa55f745051c31e48c0002699e17d0ef88eb2100 (patch) | |
tree | 7c16cc2b4937b676f8efb967d024e6827a9b2b09 /java/java.go | |
parent | 81febc4500087425f1b3725a0f8fd83a68bc73b8 (diff) |
Allow access to the class jar for java_import using {.jar} tag
Layoutlib requires access to the jar file (containing .class) files for
a number of libraries including "core-libart". It does that using the
{.jar} output tag, e.g. "core-libart{.jar}".
This change makes sure that works when "core-libart" is provided as a
java_import instead of a java_library.
Bug: 142938164
Test: m nothing
Change-Id: I605019d680c28e4a33f0ca14279d63fa62b9774b
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 1d7eaa771..b5108bf3e 100644 --- a/java/java.go +++ b/java/java.go @@ -2699,6 +2699,17 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } +func (j *Import) OutputFiles(tag string) (android.Paths, error) { + switch tag { + case ".jar": + return android.Paths{j.combinedClasspathFile}, nil + default: + return nil, fmt.Errorf("unsupported module reference tag %q", tag) + } +} + +var _ android.OutputFileProducer = (*Import)(nil) + var _ Dependency = (*Import)(nil) func (j *Import) HeaderJars() android.Paths { |