Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d50fd52c authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am:... 

Merge "Deprecate BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" into main am: 62093cf7 am: 04e00f62

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



Change-Id: I21b4640737c524556c76459eb5bb752f0e98a62c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4542ba9 04e00f62

android/variable.go

+11 −12
Original line number Diff line number Diff line
@@ -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"`

bp2build/bp2build_product_config.go

+0 −3
Original line number Diff line number Diff line
@@ -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"

	}