diff options
| author | 2021-11-08 11:52:49 -0800 | |
|---|---|---|
| committer | 2021-12-08 15:08:59 -0800 | |
| commit | 3dd2ff28ed41ecd3363b7c04c5d3401fe49c4e7c (patch) | |
| tree | 2d43ebc576589936ef10c384c8af3248e28d2116 /java/sdk_library.go | |
| parent | 1c35f243c5db793cc2c8b2fd7fea3530b42ce7ec (diff) | |
Build license metadata files in Soong
Soong has enough information to build the license metadata files
without resorting to the fixups required in Make.
Bug: 207445310
Test: m checkbuild
Change-Id: I8e74108376162b8fdb87ba098ebe94350aa1f7c4
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 3065d57eb..daf932e55 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1206,11 +1206,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) { |