summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-06-06 18:29:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-06-06 18:29:17 +0000
commitef9fd50b2362e8b0da94d09c056644d1f6f6d903 (patch)
tree8fc404a9fa03a57e83dbf93927f6204d2882610b
parent71d3e321ae6f7225b800f7fd6e6246310636d488 (diff)
parent142cf7a3047ce7c4d5f4450a9600399999061f93 (diff)
Merge "Disallow unknown fields in soong variables file" into main am: 4eef64a70b am: 142cf7a304
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114140 Change-Id: I2b5e0f4615f90809a32e1a596dda4c30441dd7d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--android/config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go
index da05973f6..e1bff8cce 100644
--- a/android/config.go
+++ b/android/config.go
@@ -375,6 +375,7 @@ func loadFromConfigFile(configurable *ProductVariables, filename string) error {
} else {
// Make a decoder for it
jsonDecoder := json.NewDecoder(configFileReader)
+ jsonDecoder.DisallowUnknownFields()
err = jsonDecoder.Decode(configurable)
if err != nil {
return fmt.Errorf("config file: %s did not parse correctly: %s", filename, err.Error())