diff options
| author | 2023-10-13 11:32:14 -0700 | |
|---|---|---|
| committer | 2023-10-18 15:21:14 -0700 | |
| commit | 11edf557b673f91995a4b9d26e47d942fba74dce (patch) | |
| tree | 21ed6540ba0e35b5e55844ffc92a76b57ef0bff3 /android/variable.go | |
| parent | 03787bea6d58171c084ea8840f3a717137f60687 (diff) | |
Add bazel-built modules as deps on the system image
These bazel-built modules will be installed into the system image
as part of the bazel rule, rather than going through the make staging
directory.
Bug: 297269187
Test: m bazel_sandwich
Change-Id: I96c6e58f8e0898b2ad92cb7069745ca2059a39f8
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/android/variable.go b/android/variable.go index ab6dfefd6..9896f2020 100644 --- a/android/variable.go +++ b/android/variable.go @@ -494,38 +494,40 @@ type ProductVariables struct { Release_expose_flagged_api *bool `json:",omitempty"` } +type PartitionQualifiedVariablesType struct { + BuildingImage bool `json:",omitempty"` + BoardErofsCompressor string `json:",omitempty"` + BoardErofsCompressHints string `json:",omitempty"` + BoardErofsPclusterSize string `json:",omitempty"` + BoardExtfsInodeCount string `json:",omitempty"` + BoardExtfsRsvPct string `json:",omitempty"` + BoardF2fsSloadCompressFlags string `json:",omitempty"` + BoardFileSystemCompress string `json:",omitempty"` + BoardFileSystemType string `json:",omitempty"` + BoardJournalSize string `json:",omitempty"` + BoardPartitionReservedSize string `json:",omitempty"` + BoardPartitionSize string `json:",omitempty"` + BoardSquashfsBlockSize string `json:",omitempty"` + BoardSquashfsCompressor string `json:",omitempty"` + BoardSquashfsCompressorOpt string `json:",omitempty"` + BoardSquashfsDisable4kAlign string `json:",omitempty"` + ProductBaseFsPath string `json:",omitempty"` + ProductHeadroom string `json:",omitempty"` + ProductVerityPartition string `json:",omitempty"` + + BoardAvbAddHashtreeFooterArgs string `json:",omitempty"` + BoardAvbKeyPath string `json:",omitempty"` + BoardAvbAlgorithm string `json:",omitempty"` + BoardAvbRollbackIndex string `json:",omitempty"` + BoardAvbRollbackIndexLocation string `json:",omitempty"` +} + type PartitionVariables struct { ProductDirectory string `json:",omitempty"` - PartitionQualifiedVariables map[string]struct { - BuildingImage bool `json:",omitempty"` - BoardErofsCompressor string `json:",omitempty"` - BoardErofsCompressHints string `json:",omitempty"` - BoardErofsPclusterSize string `json:",omitempty"` - BoardExtfsInodeCount string `json:",omitempty"` - BoardExtfsRsvPct string `json:",omitempty"` - BoardF2fsSloadCompressFlags string `json:",omitempty"` - BoardFileSystemCompress string `json:",omitempty"` - BoardFileSystemType string `json:",omitempty"` - BoardJournalSize string `json:",omitempty"` - BoardPartitionReservedSize string `json:",omitempty"` - BoardPartitionSize string `json:",omitempty"` - BoardSquashfsBlockSize string `json:",omitempty"` - BoardSquashfsCompressor string `json:",omitempty"` - BoardSquashfsCompressorOpt string `json:",omitempty"` - BoardSquashfsDisable4kAlign string `json:",omitempty"` - ProductBaseFsPath string `json:",omitempty"` - ProductHeadroom string `json:",omitempty"` - ProductVerityPartition string `json:",omitempty"` - - BoardAvbAddHashtreeFooterArgs string `json:",omitempty"` - BoardAvbKeyPath string `json:",omitempty"` - BoardAvbAlgorithm string `json:",omitempty"` - BoardAvbRollbackIndex string `json:",omitempty"` - BoardAvbRollbackIndexLocation string `json:",omitempty"` - } - TargetUserimagesUseExt2 bool `json:",omitempty"` - TargetUserimagesUseExt3 bool `json:",omitempty"` - TargetUserimagesUseExt4 bool `json:",omitempty"` + PartitionQualifiedVariables map[string]PartitionQualifiedVariablesType + TargetUserimagesUseExt2 bool `json:",omitempty"` + TargetUserimagesUseExt3 bool `json:",omitempty"` + TargetUserimagesUseExt4 bool `json:",omitempty"` TargetUserimagesSparseExtDisabled bool `json:",omitempty"` TargetUserimagesSparseErofsDisabled bool `json:",omitempty"` @@ -546,6 +548,8 @@ type PartitionVariables struct { CopyImagesForTargetFilesZip bool `json:",omitempty"` BoardAvbEnable bool `json:",omitempty"` + + ProductPackages []string `json:",omitempty"` } func boolPtr(v bool) *bool { |