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

Merge "Limit release config inheritance from aliases" into main am: ff1d27d5b4

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

Change-Id: I5d1d7ccaeda1b338d3363fea66a48bdfb312daa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
LaMont Jones
2024-05-31 15:50:12 +00:00
committed by Automerger Merge Worker
parent 54ddc87436 ff1d27d5b4
commit 52bbe54894
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/release_config/release_config_lib/release_config.go
View File

@@ -162,6 +162,9 @@ func (config *ReleaseConfig) GenerateReleaseConfig(configs *ReleaseConfigs) erro
if _, ok := myInheritsSet[inherit]; ok { if _, ok := myInheritsSet[inherit]; ok {
continue continue
} }
if isBuildPrefix && configs.Aliases[inherit] != nil {
return fmt.Errorf("%s cannot inherit from alias %s", config.Name, inherit)
}
myInherits = append(myInherits, inherit) myInherits = append(myInherits, inherit)
myInheritsSet[inherit] = true myInheritsSet[inherit] = true
iConfig, err := configs.GetReleaseConfig(inherit) iConfig, err := configs.GetReleaseConfig(inherit)