Merge "Initialize TaggedOutputFiles before updating it" into main am: aff9a2c7ac
am: ceb7029f37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118931 Change-Id: Ic5f2281148d9738fae56cc515ddf57097ee1ed6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -718,6 +718,9 @@ func (m *moduleContext) SetOutputFiles(outputFiles Paths, tag string) {
|
||||
}
|
||||
m.module.base().outputFiles.DefaultOutputFiles = outputFiles
|
||||
} else {
|
||||
if m.module.base().outputFiles.TaggedOutputFiles == nil {
|
||||
m.module.base().outputFiles.TaggedOutputFiles = make(map[string]Paths)
|
||||
}
|
||||
if _, exists := m.module.base().outputFiles.TaggedOutputFiles[tag]; exists {
|
||||
m.ModuleErrorf("Module %s OutputFiles at tag %s cannot be overwritten", m.ModuleName(), tag)
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user