diff options
| author | 2021-12-10 23:04:45 +0000 | |
|---|---|---|
| committer | 2021-12-10 23:04:45 +0000 | |
| commit | 67938c292547ee0ef03e273f13c7ac7ec85e5c45 (patch) | |
| tree | 19f599d3d2de4b409ed9454f7d42fb6d617f411d /java/sdk_library.go | |
| parent | b435744fdc3d13558ac30f4c3e2e02eb1243a4b6 (diff) | |
| parent | b3264f20905792e553561e9e0076eaf95d80a25d (diff) | |
Merge changes from topic "revert-1899703-AMWIVCREEV"
* changes:
Revert "Build license metadata files in Soong"
Revert "Add dependency license annotations"
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index de0d796cc..52ab06ec5 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1222,16 +1222,11 @@ func (module *SdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { func (module *SdkLibrary) OutputFiles(tag string) (android.Paths, error) { paths, err := module.commonOutputFiles(tag) - if paths != nil || err != nil { - return paths, err - } - if module.requiresRuntimeImplementationLibrary() { + if paths == nil && err == nil { return module.Library.OutputFiles(tag) + } else { + return paths, err } - if tag == "" { - return nil, nil - } - return nil, fmt.Errorf("unsupported module reference tag %q", tag) } func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { |