From 3dd2ff28ed41ecd3363b7c04c5d3401fe49c4e7c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 8 Nov 2021 11:52:49 -0800 Subject: 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 --- java/sdk_library.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'java/sdk_library.go') 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) { -- cgit v1.2.3-59-g8ed1b