commit 246a30a1cbfc1b3becdb22511a8a94094671bcb4
author Tao Bao <tbao@google.com> Wed May 08 18:37:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 08 18:37:28 2019 +0000
tree 8a4725bf79f02ad864b183ec2becd2bd7c28ac2e
parent 84c96eba1eeae3c2a423ffb1d1e7ce22299f9c66
parent ff2a3f0af8dbc399652a45419d4a80c8316e107a

Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon."

target/board/BoardConfigMainlineCommon.mk

diff --git a/target/board/BoardConfigMainlineCommon.mk b/target/board/BoardConfigMainlineCommon.mk
index 6c56671..be7c804 100644
--- a/target/board/BoardConfigMainlineCommon.mk
+++ b/target/board/BoardConfigMainlineCommon.mk
@@ -36,9 +36,6 @@
 
 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

diff --git a/target/board/mainline_arm64/BoardConfig.mk b/target/board/mainline_arm64/BoardConfig.mk
index 8bb6212..70505f4 100644
--- a/target/board/mainline_arm64/BoardConfig.mk
+++ b/target/board/mainline_arm64/BoardConfig.mk
@@ -28,6 +28,8 @@
 
 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