Merge "Use OutputFilesProvider on gen_notice" into main am: 7daabf71ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118356 Change-Id: Ia870452db22ca1659504286c5da27ba4767562da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4f974b408d
1 changed files with 1 additions and 10 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue