StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main

Browse Source
This commit is contained in:
Yi-Yo Chiang
2023-11-28 00:38:44 +00:00
committed by Gerrit Code Review
parent fc1e0cec4c 939fe1a751
commit 62093cf7fc
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android/variable.go
View File

@@ -538,18 +538,17 @@ type PartitionVariables struct {
TargetUserimagesSparseSquashfsDisabled bool `json:",omitempty"` TargetUserimagesSparseSquashfsDisabled bool `json:",omitempty"`
TargetUserimagesSparseF2fsDisabled bool `json:",omitempty"` TargetUserimagesSparseF2fsDisabled bool `json:",omitempty"`
BoardErofsCompressor string `json:",omitempty"` BoardErofsCompressor string `json:",omitempty"`
BoardErofsCompressorHints string `json:",omitempty"` BoardErofsCompressorHints string `json:",omitempty"`
BoardErofsPclusterSize string `json:",omitempty"` BoardErofsPclusterSize string `json:",omitempty"`
BoardErofsShareDupBlocks string `json:",omitempty"` BoardErofsShareDupBlocks string `json:",omitempty"`
BoardErofsUseLegacyCompression string `json:",omitempty"` BoardErofsUseLegacyCompression string `json:",omitempty"`
BoardExt4ShareDupBlocks string `json:",omitempty"` BoardExt4ShareDupBlocks string `json:",omitempty"`
BoardFlashLogicalBlockSize string `json:",omitempty"` BoardFlashLogicalBlockSize string `json:",omitempty"`
BoardFlashEraseBlockSize string `json:",omitempty"` BoardFlashEraseBlockSize string `json:",omitempty"`
BoardUsesRecoveryAsBoot bool `json:",omitempty"` BoardUsesRecoveryAsBoot bool `json:",omitempty"`
BoardBuildGkiBootImageWithoutRamdisk bool `json:",omitempty"` ProductUseDynamicPartitionSize bool `json:",omitempty"`
ProductUseDynamicPartitionSize bool `json:",omitempty"` CopyImagesForTargetFilesZip bool `json:",omitempty"`
CopyImagesForTargetFilesZip bool `json:",omitempty"`
BoardAvbEnable bool `json:",omitempty"` BoardAvbEnable bool `json:",omitempty"`

3
bp2build/bp2build_product_config.go
View File

@@ -793,9 +793,6 @@ func generateImagePropDictionary(variables *android.PartitionVariables, partitio
if variables.BoardUsesRecoveryAsBoot { if variables.BoardUsesRecoveryAsBoot {
ret["recovery_as_boot"] = "true" ret["recovery_as_boot"] = "true"
} }
if variables.BoardBuildGkiBootImageWithoutRamdisk {
ret["gki_boot_image_without_ramdisk"] = "true"
}
if variables.ProductUseDynamicPartitionSize { if variables.ProductUseDynamicPartitionSize {
ret["use_dynamic_partition_size"] = "true" ret["use_dynamic_partition_size"] = "true"
} }