Merge "Use OutputFilesProvider on gen_notice" into main

This commit is contained in:
Zi Wang 2024-06-07 02:36:54 +00:00 committed by Gerrit Code Review
commit 7daabf71ef

View file

@ -176,6 +176,7 @@ func (m *genNoticeModule) GenerateAndroidBuildActions(ctx ModuleContext) {
} }
out := m.getStem() + m.getSuffix() out := m.getStem() + m.getSuffix()
m.output = PathForModuleOut(ctx, out).OutputPath m.output = PathForModuleOut(ctx, out).OutputPath
ctx.SetOutputFiles(Paths{m.output}, "")
} }
func GenNoticeFactory() Module { func GenNoticeFactory() Module {
@ -193,16 +194,6 @@ func GenNoticeFactory() Module {
return module return module
} }
var _ OutputFileProducer = (*genNoticeModule)(nil)
// Implements OutputFileProducer
func (m *genNoticeModule) OutputFiles(tag string) (Paths, error) {
if tag == "" {
return Paths{m.output}, nil
}
return nil, fmt.Errorf("unrecognized tag %q", tag)
}
var _ AndroidMkEntriesProvider = (*genNoticeModule)(nil) var _ AndroidMkEntriesProvider = (*genNoticeModule)(nil)
// Implements AndroidMkEntriesProvider // Implements AndroidMkEntriesProvider