summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
author Zi Wang <mrziwang@google.com> 2024-11-08 20:01:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-08 20:01:57 +0000
commitb45fcc3e31fa1de7997cc45b6b7d43e5d36059b6 (patch)
tree7cac2f1399cf51253888bef2cd7469f9338154d8 /android/variable.go
parent30f1883030ae3f80d98e89eb4b364b5ceb05c123 (diff)
parent7f81847cf80e69f0fc377eca44b6ae67be7c7954 (diff)
Merge "Auto generate userdata.img" into main am: 29520dbdff am: 7f81847cf8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3342023 Change-Id: Idf2cb2c132df56c10c4291996bc0d8785116c7e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go24
1 files changed, 13 insertions, 11 deletions
diff --git a/android/variable.go b/android/variable.go
index e7b14fde7..f249aa025 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -339,17 +339,19 @@ type ProductVariables struct {
HWASanIncludePaths []string `json:",omitempty"`
HWASanExcludePaths []string `json:",omitempty"`
- VendorPath *string `json:",omitempty"`
- VendorDlkmPath *string `json:",omitempty"`
- BuildingVendorImage *bool `json:",omitempty"`
- OdmPath *string `json:",omitempty"`
- BuildingOdmImage *bool `json:",omitempty"`
- OdmDlkmPath *string `json:",omitempty"`
- ProductPath *string `json:",omitempty"`
- BuildingProductImage *bool `json:",omitempty"`
- SystemExtPath *string `json:",omitempty"`
- SystemDlkmPath *string `json:",omitempty"`
- OemPath *string `json:",omitempty"`
+ VendorPath *string `json:",omitempty"`
+ VendorDlkmPath *string `json:",omitempty"`
+ BuildingVendorImage *bool `json:",omitempty"`
+ OdmPath *string `json:",omitempty"`
+ BuildingOdmImage *bool `json:",omitempty"`
+ OdmDlkmPath *string `json:",omitempty"`
+ ProductPath *string `json:",omitempty"`
+ BuildingProductImage *bool `json:",omitempty"`
+ SystemExtPath *string `json:",omitempty"`
+ SystemDlkmPath *string `json:",omitempty"`
+ OemPath *string `json:",omitempty"`
+ UserdataPath *string `json:",omitempty"`
+ BuildingUserdataImage *bool `json:",omitempty"`
ClangTidy *bool `json:",omitempty"`
TidyChecks *string `json:",omitempty"`