Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon."

2019-05-08 18:37:28 +00:00
parent 84c96eba1e ff2a3f0af8
commit 246a30a1cb
2 changed files with 2 additions and 3 deletions
--- a/target/board/BoardConfigMainlineCommon.mk
+++ b/target/board/BoardConfigMainlineCommon.mk
@@ -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

--- a/target/board/mainline_arm64/BoardConfig.mk
+++ b/target/board/mainline_arm64/BoardConfig.mk
@@ -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