diff --git a/BoardConfig.mk b/BoardConfig.mk index c5af346..68136c3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -12,13 +12,19 @@ ALLOW_MISSING_DEPENDENCIES := true # A/B AB_OTA_UPDATER := true +BOARD_BUILD_SYSTEM_ROOT_IMAGE := false AB_OTA_PARTITIONS += \ + boot \ + dtbo \ + product \ system \ system_ext \ - product \ + recovery \ + vbmeta \ + vbmeta_system \ vendor \ - odm -BOARD_USES_RECOVERY_AS_BOOT := true + vendor_dlkm \ + vendor_boot # Architecture TARGET_ARCH := arm64 diff --git a/device.mk b/device.mk index 7e4cf26..074fe76 100644 --- a/device.mk +++ b/device.mk @@ -22,6 +22,12 @@ AB_OTA_POSTINSTALL_CONFIG += \ FILESYSTEM_TYPE_system=ext4 \ POSTINSTALL_OPTIONAL_system=true +AB_OTA_POSTINSTALL_CONFIG += \ + RUN_POSTINSTALL_vendor=true \ + POSTINSTALL_PATH_vendor=bin/checkpoint_gc \ + FILESYSTEM_TYPE_vendor=ext4 \ + POSTINSTALL_OPTIONAL_vendor=true + # Boot control HAL PRODUCT_PACKAGES += \ android.hardware.boot@1.0-impl \ @@ -43,6 +49,9 @@ PRODUCT_PACKAGES += \ update_verifier \ update_engine_sideload +# Dynamic partitions +PRODUCT_USE_DYNAMIC_PARTITIONS := true + # F2FS utilities PRODUCT_PACKAGES += \ sg_write_buffer \ diff --git a/twrp_hiphi.mk b/twrp_hiphi.mk index 3b761d3..914078c 100644 --- a/twrp_hiphi.mk +++ b/twrp_hiphi.mk @@ -11,6 +11,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) # Inherit some common TWRP stuff. $(call inherit-product, vendor/twrp/config/common.mk)