| commit | a2a708a616405de7cf3b108851bebdf8eab54832 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed May 08 11:52:14 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 08 11:52:14 2019 -0700 |
| tree | 48facca200ef17243c5e9817f255ae9b5e6717dc | |
| parent | e9425427c25af716f057a6a69f0800ec82055050 [diff] | |
| parent | 246a30a1cbfc1b3becdb22511a8a94094671bcb4 [diff] |
Merge "Unset AB_OTA_UPDATER from BoardConfigMainlineCommon." am: 246a30a1cb Change-Id: If58241d1c5af2051f3bb40d503b5ee45c6a46b54
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
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