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

Commit ccf93e60 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Enable AB_OTA_UPDATER for mainline" am: 30355b60 am: fa96c5c4 

am: 5d6db45d

Change-Id: I752e88c304e500e374ae42c3218ca4647e493374
parents c27bcf5f 5d6db45d

target/board/BoardConfigMainlineCommon.mk

+4 −0
Original line number Diff line number Diff line
@@ -39,3 +39,7 @@ BOARD_AVB_ENABLE := true 
BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)



BOARD_CHARGER_ENABLE_SUSPEND := true



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

target/product/gsi_common.mk

+0 −4
Original line number Diff line number Diff line
@@ -64,10 +64,6 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true 
# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true