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 am: 62093cf7fc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2845654

Change-Id: I99dc9f93d1e0005e928b6bddddc328bef15e87fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-Yo Chiang
2023-11-28 01:03:00 +00:00
committed by Automerger Merge Worker
parent 585f54c6e4 62093cf7fc
commit 04e00f621e
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/variable.go
View File

@@ -547,7 +547,6 @@ type PartitionVariables struct {
BoardFlashLogicalBlockSize string `json:",omitempty"`
BoardFlashEraseBlockSize string `json:",omitempty"`
BoardUsesRecoveryAsBoot bool `json:",omitempty"`
BoardBuildGkiBootImageWithoutRamdisk bool `json:",omitempty"`
ProductUseDynamicPartitionSize bool `json:",omitempty"`
CopyImagesForTargetFilesZip bool `json:",omitempty"`

3
bp2build/bp2build_product_config.go
View File

@@ -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"
}