diff options
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/android/variable.go b/android/variable.go index 037037d6a..2d43c6da4 100644 --- a/android/variable.go +++ b/android/variable.go @@ -408,7 +408,6 @@ type ProductVariables struct { Ndk_abis *bool `json:",omitempty"` - TrimmedApex *bool `json:",omitempty"` ForceApexSymlinkOptimization *bool `json:",omitempty"` CompressedApex *bool `json:",omitempty"` Aml_abis *bool `json:",omitempty"` @@ -607,10 +606,20 @@ type PartitionVariables struct { BoardExt4ShareDupBlocks string `json:",omitempty"` BoardFlashLogicalBlockSize string `json:",omitempty"` BoardFlashEraseBlockSize string `json:",omitempty"` - BoardUsesRecoveryAsBoot bool `json:",omitempty"` ProductUseDynamicPartitionSize bool `json:",omitempty"` CopyImagesForTargetFilesZip bool `json:",omitempty"` + // Boot image stuff + ProductBuildBootImage bool `json:",omitempty"` + ProductBuildInitBootImage bool `json:",omitempty"` + BoardUsesRecoveryAsBoot bool `json:",omitempty"` + BoardPrebuiltBootimage string `json:",omitempty"` + BoardPrebuiltInitBootimage string `json:",omitempty"` + BoardBootimagePartitionSize string `json:",omitempty"` + BoardInitBootimagePartitionSize string `json:",omitempty"` + BoardBootHeaderVersion string `json:",omitempty"` + + // Avb (android verified boot) stuff BoardAvbEnable bool `json:",omitempty"` BoardAvbAlgorithm string `json:",omitempty"` BoardAvbKeyPath string `json:",omitempty"` @@ -626,10 +635,18 @@ type PartitionVariables struct { BoardInfoFiles []string `json:",omitempty"` BootLoaderBoardName string `json:",omitempty"` - ProductCopyFiles map[string]string `json:",omitempty"` - - BuildingSystemDlkmImage bool `json:",omitempty"` - SystemKernelModules []string `json:",omitempty"` + ProductCopyFiles []string `json:",omitempty"` + + BuildingSystemDlkmImage bool `json:",omitempty"` + SystemKernelModules []string `json:",omitempty"` + SystemKernelBlocklistFile string `json:",omitempty"` + SystemKernelLoadModules []string `json:",omitempty"` + BuildingVendorDlkmImage bool `json:",omitempty"` + VendorKernelModules []string `json:",omitempty"` + VendorKernelBlocklistFile string `json:",omitempty"` + BuildingOdmDlkmImage bool `json:",omitempty"` + OdmKernelModules []string `json:",omitempty"` + OdmKernelBlocklistFile string `json:",omitempty"` } func boolPtr(v bool) *bool { @@ -680,7 +697,6 @@ func (v *ProductVariables) SetDefaultConfig() { Malloc_zero_contents: boolPtr(true), Malloc_pattern_fill_contents: boolPtr(false), Safestack: boolPtr(false), - TrimmedApex: boolPtr(false), Build_from_text_stub: boolPtr(false), BootJars: ConfiguredJarList{apexes: []string{}, jars: []string{}}, |