diff options
| author | 2021-12-10 22:52:43 +0000 | |
|---|---|---|
| committer | 2021-12-10 23:02:57 +0000 | |
| commit | b3264f20905792e553561e9e0076eaf95d80a25d (patch) | |
| tree | 846b3f37576fb812937251adb2fa4aef258a0583 /java/sdk_library.go | |
| parent | abe2a4b7bfc559255838cbc08a60f84eb5baf046 (diff) | |
Revert "Build license metadata files in Soong"
Revert submission 1899703
Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong
Change-Id: I48f2bf2e2797ac9d38f7ece35ba616b823035607
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 daf932e55..3065d57eb 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1206,16 +1206,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) { |