Merge "Initialize TaggedOutputFiles before updating it" into main

2024-06-06 21:54:15 +00:00
parent 4eef64a70b 57768d7437
commit aff9a2c7ac
1 changed files with 3 additions and 0 deletions
--- a/android/module_context.go
+++ b/android/module_context.go
@@ -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 {