diff options
| author | 2024-11-07 20:47:49 +0000 | |
|---|---|---|
| committer | 2024-11-07 20:47:49 +0000 | |
| commit | 50cb131c37f5da3a9a9a2b51ac3a954e1ad81795 (patch) | |
| tree | a6146874fef734dd093d6c444795f22b24c35cd1 /android/variable.go | |
| parent | 1fa1c6db4f4d862f20b4789be4bc98e7f9be7c06 (diff) | |
Revert "Build vbmeta partitions with soong"
Revert submission 3341139-vbmeta_partitions_in_soong
Reason for revert: DroidMonitor: Potential culprit for http://b/377943457.
Reverted changes: /q/submissionid:3341139-vbmeta_partitions_in_soong
Change-Id: I7a3aeacc91f17832688ee4d917cdee34db5d4a1b
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/android/variable.go b/android/variable.go index f82c9cae8..142fab95f 100644 --- a/android/variable.go +++ b/android/variable.go @@ -577,14 +577,6 @@ type PartitionQualifiedVariablesType struct { BoardAvbRollbackIndexLocation string `json:",omitempty"` } -type ChainedAvbPartitionProps struct { - Partitions []string `json:",omitempty"` - Key string `json:",omitempty"` - Algorithm string `json:",omitempty"` - RollbackIndex string `json:",omitempty"` - RollbackIndexLocation string `json:",omitempty"` -} - type PartitionVariables struct { ProductDirectory string `json:",omitempty"` PartitionQualifiedVariables map[string]PartitionQualifiedVariablesType @@ -609,12 +601,7 @@ type PartitionVariables struct { ProductUseDynamicPartitionSize bool `json:",omitempty"` CopyImagesForTargetFilesZip bool `json:",omitempty"` - BoardAvbEnable bool `json:",omitempty"` - BoardAvbAlgorithm string `json:",omitempty"` - BoardAvbKeyPath string `json:",omitempty"` - BoardAvbRollbackIndex string `json:",omitempty"` - BuildingVbmetaImage bool `json:",omitempty"` - ChainedVbmetaPartitions map[string]ChainedAvbPartitionProps `json:",omitempty"` + BoardAvbEnable bool `json:",omitempty"` ProductPackages []string `json:",omitempty"` ProductPackagesDebug []string `json:",omitempty"` |