diff options
| author | 2021-12-11 03:32:18 +0000 | |
|---|---|---|
| committer | 2021-12-11 03:32:18 +0000 | |
| commit | f4c2bf65597c771a8f09f236e41cfc46e8f49172 (patch) | |
| tree | add2d9d05efb5cc710760331517c1b26ddfe654d /java/sdk_library.go | |
| parent | 67938c292547ee0ef03e273f13c7ac7ec85e5c45 (diff) | |
| parent | 65cb314c92ab811be64bbf644fb5ee9826b00ab1 (diff) | |
Merge changes from topic "revert-1918946-revert-1899703-AMWIVCREEV-CCTEXIRRRV"
* changes:
Revert^2 "Add dependency license annotations"
Revert^2 "Build license metadata files in Soong"
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 52ab06ec5..de0d796cc 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1222,11 +1222,16 @@ 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 module.Library.OutputFiles(tag) - } else { + if paths != nil || err != nil { return paths, err } + if module.requiresRuntimeImplementationLibrary() { + return module.Library.OutputFiles(tag) + } + if tag == "" { + return nil, nil + } + return nil, fmt.Errorf("unsupported module reference tag %q", tag) } func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { |