Loading android/module.go +3 −2 Original line number Diff line number Diff line Loading @@ -2524,8 +2524,7 @@ func outputFilesForModule(ctx PathContext, module blueprint.Module, tag string) // *inter-module-communication*. // If mctx module is the same as the param module the output files are obtained // from outputFiles property of module base, to avoid both setting and // reading OutputFilesProvider before GenerateBuildActions is finished. Also // only empty-string-tag is supported in this case. // reading OutputFilesProvider before GenerateBuildActions is finished. // If a module doesn't have the OutputFilesProvider, nil is returned. func outputFilesForModuleFromProvider(ctx PathContext, module blueprint.Module, tag string) (Paths, error) { // TODO: support OutputFilesProvider for singletons Loading @@ -2546,6 +2545,8 @@ func outputFilesForModuleFromProvider(ctx PathContext, module blueprint.Module, } else { if tag == "" { return mctx.Module().base().outputFiles.DefaultOutputFiles, nil } else if taggedOutputFiles, hasTag := mctx.Module().base().outputFiles.TaggedOutputFiles[tag]; hasTag { return taggedOutputFiles, nil } else { return nil, fmt.Errorf("unsupported tag %q for module getting its own output files", tag) } Loading Loading
android/module.go +3 −2 Original line number Diff line number Diff line Loading @@ -2524,8 +2524,7 @@ func outputFilesForModule(ctx PathContext, module blueprint.Module, tag string) // *inter-module-communication*. // If mctx module is the same as the param module the output files are obtained // from outputFiles property of module base, to avoid both setting and // reading OutputFilesProvider before GenerateBuildActions is finished. Also // only empty-string-tag is supported in this case. // reading OutputFilesProvider before GenerateBuildActions is finished. // If a module doesn't have the OutputFilesProvider, nil is returned. func outputFilesForModuleFromProvider(ctx PathContext, module blueprint.Module, tag string) (Paths, error) { // TODO: support OutputFilesProvider for singletons Loading @@ -2546,6 +2545,8 @@ func outputFilesForModuleFromProvider(ctx PathContext, module blueprint.Module, } else { if tag == "" { return mctx.Module().base().outputFiles.DefaultOutputFiles, nil } else if taggedOutputFiles, hasTag := mctx.Module().base().outputFiles.TaggedOutputFiles[tag]; hasTag { return taggedOutputFiles, nil } else { return nil, fmt.Errorf("unsupported tag %q for module getting its own output files", tag) } Loading