diff options
| -rw-r--r-- | android/variable.go | 23 | ||||
| -rw-r--r-- | bp2build/bp2build_product_config.go | 3 |
2 files changed, 11 insertions, 15 deletions
diff --git a/android/variable.go b/android/variable.go index fe3a6d790..307deaf32 100644 --- a/android/variable.go +++ b/android/variable.go @@ -538,18 +538,17 @@ type PartitionVariables struct { TargetUserimagesSparseSquashfsDisabled bool `json:",omitempty"` TargetUserimagesSparseF2fsDisabled bool `json:",omitempty"` - BoardErofsCompressor string `json:",omitempty"` - BoardErofsCompressorHints string `json:",omitempty"` - BoardErofsPclusterSize string `json:",omitempty"` - BoardErofsShareDupBlocks string `json:",omitempty"` - BoardErofsUseLegacyCompression string `json:",omitempty"` - BoardExt4ShareDupBlocks string `json:",omitempty"` - BoardFlashLogicalBlockSize string `json:",omitempty"` - BoardFlashEraseBlockSize string `json:",omitempty"` - BoardUsesRecoveryAsBoot bool `json:",omitempty"` - BoardBuildGkiBootImageWithoutRamdisk bool `json:",omitempty"` - ProductUseDynamicPartitionSize bool `json:",omitempty"` - CopyImagesForTargetFilesZip bool `json:",omitempty"` + BoardErofsCompressor string `json:",omitempty"` + BoardErofsCompressorHints string `json:",omitempty"` + BoardErofsPclusterSize string `json:",omitempty"` + BoardErofsShareDupBlocks string `json:",omitempty"` + BoardErofsUseLegacyCompression string `json:",omitempty"` + BoardExt4ShareDupBlocks string `json:",omitempty"` + BoardFlashLogicalBlockSize string `json:",omitempty"` + BoardFlashEraseBlockSize string `json:",omitempty"` + BoardUsesRecoveryAsBoot bool `json:",omitempty"` + ProductUseDynamicPartitionSize bool `json:",omitempty"` + CopyImagesForTargetFilesZip bool `json:",omitempty"` BoardAvbEnable bool `json:",omitempty"` diff --git a/bp2build/bp2build_product_config.go b/bp2build/bp2build_product_config.go index 7f26bef3b..0d1e433e9 100644 --- a/bp2build/bp2build_product_config.go +++ b/bp2build/bp2build_product_config.go @@ -793,9 +793,6 @@ func generateImagePropDictionary(variables *android.PartitionVariables, partitio if variables.BoardUsesRecoveryAsBoot { ret["recovery_as_boot"] = "true" } - if variables.BoardBuildGkiBootImageWithoutRamdisk { - ret["gki_boot_image_without_ramdisk"] = "true" - } if variables.ProductUseDynamicPartitionSize { ret["use_dynamic_partition_size"] = "true" } |