Enable AVB 2.0 and generation of DTBO image

 Support  A/B and split

BoardConfig.mk

@@ -66,8 +66,8 @@ BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 an
 BOARD_KERNEL_CMDLINE += androidboot.bootdevice=7824900.sdhci earlycon=msm_serial_dm,0x78af000 firmware_class.path=/vendor/firmware_mnt/image androidboot.usbconfigfs=true loop.max_part=7
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 #BOARD_KERNEL_SEPARATED_DT := true #TODO
-BOARD_KERNEL_SEPARATED_DTBO := true
 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
+BOARD_KERNEL_SEPARATED_DTBO := true
 TARGET_KERNEL_VERSION := 4.9
 TARGET_KERNEL_ADDITIONAL_FLAGS := \
     DTC=$(shell pwd)/prebuilts/misc/$(HOST_OS)-x86/dtc/dtc \
@@ -83,7 +83,9 @@ TARGET_OTA_ASSERT_DEVICE := FP3
 # Filesystem
 BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_USES_METADATA_PARTITION := true
 TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USES_MKE2FS := true
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 131072
@@ -115,12 +117,29 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
 # Recovery
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab ##TODO
 
+# Vendor Security Patch Level
+VENDOR_SECURITY_PATCH := "2018-08-05"
+
 # Encryption
 TARGET_HW_DISK_ENCRYPTION := false
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
 
+# Treble
+BOARD_VNDK_VERSION := current
+
+BOARD_AVB_ENABLE := true
+
+# When AVB 2.0 is enabled, dm-verity is enabled differently,
+# below definitions are only required for AVB 1.0
+ifeq ($(BOARD_AVB_ENABLE),false)
+# dm-verity definitions
+	PRODUCT_SUPPORTS_VERITY := true
+	PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system
+	PRODUCT_VENDOR_VERITY_PARTITION=/dev/block/bootdevice/by-name/vendor
+endif
+
 # INIT
 # TARGET_INIT_VENDOR_LIB := libinit_msm #Important
 

device.mk

@@ -24,6 +24,53 @@ $(call inherit-product-if-exists, vendor/fairphone/FP3/FP3-vendor.mk)
 DEVICE_PACKAGE_OVERLAYS += \
 	$(LOCAL_PATH)/overlay
 
+# A/B related defines
+AB_OTA_UPDATER := true
+# Full A/B partiton update set
+# AB_OTA_PARTITIONS := xbl rpm tz hyp pmic modem abl boot keymaster cmnlib cmnlib64 system bluetooth
+# Baseline
+# AB_OTA_PARTITIONS := aboot cmnlib64 cmnlib devcfg dsp dtbo keymaster lksecapp mdtp modem rpm sbl1 tz vbmeta boot system vendor product
+# Subset A/B partitions for Android-only image update
+# AB_OTA_PARTITIONS ?= boot system
+
+AB_OTA_PARTITIONS += \
+    boot \
+    dtbo \
+    system \
+    vendor
+
+# Default A/B configuration.
+ENABLE_AB ?= true
+
+ifeq ($(ENABLE_AB),true)
+#A/B related packages
+PRODUCT_PACKAGES += update_engine \
+                   update_engine_client \
+                   update_verifier \
+                   bootctrl.msm8953 \
+                   brillo_update_payload \
+                   android.hardware.boot@1.0-impl \
+                   android.hardware.boot@1.0-service
+#Boot control HAL test app
+PRODUCT_PACKAGES_DEBUG += bootctl
+endif
+
+AB_OTA_POSTINSTALL_CONFIG += \
+    RUN_POSTINSTALL_system=true \
+    POSTINSTALL_PATH_system=system/bin/otapreopt_script \
+    FILESYSTEM_TYPE_system=ext4 \
+    POSTINSTALL_OPTIONAL_system=true
+
+PRODUCT_PACKAGES += \
+    otapreopt_script \
+    update_engine_sideload
+
+PRODUCT_STATIC_BOOT_CONTROL_HAL := \
+    libcutils \
+    bootctrl.msm8953 \
+    libgptutils \
+    libz
+
 # AAPT
 PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := 560dpi