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

Commit 9c3a698d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am:... 

Merge "Emit virtual_ab_compression prop to dynamic_parttiion_info.txt" am: 6e455b8c am: f72ca016

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5960b29e78c0ef686fc1bdc8df08fa4baeb651d0
parents f2b59e29 f72ca016

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4540,6 +4540,8 @@ define dump-dynamic-partitions-info 
    echo "super_partition_error_limit=$(BOARD_SUPER_PARTITION_ERROR_LIMIT)" >> $(1))

  $(if $(filter true,$(PRODUCT_VIRTUAL_AB_OTA)), \

    echo "virtual_ab=true" >> $(1))

  $(if $(filter true,$(PRODUCT_VIRTUAL_AB_COMPRESSION)), \

    echo "virtual_ab_compression=true" >> $(1))

  $(if $(filter true,$(PRODUCT_VIRTUAL_AB_OTA_RETROFIT)), \

    echo "virtual_ab_retrofit=true" >> $(1))

endef

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -389,6 +389,9 @@ _product_single_value_vars += PRODUCT_CHECK_ELF_FILES 
# If set, device uses virtual A/B.

_product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA



# If set, device uses virtual A/B Compression.

_product_single_value_vars += PRODUCT_VIRTUAL_AB_COMPRESSION



# If set, device retrofits virtual A/B.

_product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA_RETROFIT

target/product/virtual_ab_ota/compression.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk)



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true



PRODUCT_VIRTUAL_AB_COMPRESSION := true

PRODUCT_PACKAGES += \

    snapuserd.vendor_ramdisk \

    snapuserd \

target/product/virtual_ab_ota/compression_retrofit.mk

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true

PRODUCT_VIRTUAL_AB_COMPRESSION := true



# For devices that are not GKI-capable (eg do not have vendor_boot),

# snapuserd.ramdisk is included rather than snapuserd.vendor_ramdisk.