Merge "Enable AB_OTA_UPDATER for mainline"

2019-03-25 09:20:32 +00:00
parent 9a5093e5f9 571fab0610
commit 30355b60f7
2 changed files with 4 additions and 4 deletions
--- a/target/board/BoardConfigMainlineCommon.mk
+++ b/target/board/BoardConfigMainlineCommon.mk
@@ -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
--- a/target/product/gsi_common.mk
+++ b/target/product/gsi_common.mk
@@ -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