StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initialize TaggedOutputFiles before updating it" into main am: aff9a2c7ac

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118931

Change-Id: I1ca3a5cf62bce15d4399b133548c358a8e82ec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2024-06-06 22:08:22 +00:00
committed by Automerger Merge Worker
parent 142cf7a304 aff9a2c7ac
commit ceb7029f37
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/module_context.go
View File

@@ -718,6 +718,9 @@ func (m *moduleContext) SetOutputFiles(outputFiles Paths, tag string) {
} }
m.module.base().outputFiles.DefaultOutputFiles = outputFiles m.module.base().outputFiles.DefaultOutputFiles = outputFiles
} else { } 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 { if _, exists := m.module.base().outputFiles.TaggedOutputFiles[tag]; exists {
m.ModuleErrorf("Module %s OutputFiles at tag %s cannot be overwritten", m.ModuleName(), tag) m.ModuleErrorf("Module %s OutputFiles at tag %s cannot be overwritten", m.ModuleName(), tag)
} else { } else {