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

Commit 6fca1fd3 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon." am: 246a30a1 am: a2a708a6 

am: 5a45dd64

Change-Id: Ibdace806b3223772e7edbc0b3d8f85b1aef1f545
parents b8f69e8b 5a45dd64

target/board/BoardConfigMainlineCommon.mk

+0 −3
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) 


BOARD_CHARGER_ENABLE_SUSPEND := true



# Enable A/B update

AB_OTA_UPDATER := true



# Enable system property split for Treble

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/mainline_arm64/BoardConfig.mk

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ include build/make/target/board/BoardConfigMainlineCommon.mk 


TARGET_NO_KERNEL := true



# Build generic A/B format system-only OTA.

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system



BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4