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

Merge "Disallow unknown fields in soong variables file" into main am: 4eef64a70b

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

Change-Id: I79650c9d87247d91f9a33454a1ff7e3e3a7abeef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-06-06 18:07:14 +00:00
committed by Automerger Merge Worker
parent b9bc2f388a 4eef64a70b
commit 142cf7a304
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/config.go
View File

@@ -370,6 +370,7 @@ func loadFromConfigFile(configurable *ProductVariables, filename string) error {
} else { } else {
// Make a decoder for it // Make a decoder for it
jsonDecoder := json.NewDecoder(configFileReader) jsonDecoder := json.NewDecoder(configFileReader)
jsonDecoder.DisallowUnknownFields()
err = jsonDecoder.Decode(configurable) err = jsonDecoder.Decode(configurable)
if err != nil { if err != nil {
return fmt.Errorf("config file: %s did not parse correctly: %s", filename, err.Error()) return fmt.Errorf("config file: %s did not parse correctly: %s", filename, err.Error())