Merge "Appending per-partition os_version into AVB props" am: 196f64bc am: 5aa1aecc

  $(error BOARD_AVB_VBMETA_SYSTEM and BOARD_AVB_VBMETA_VENDOR cannot have duplicates)

endif

# Appends security patch level as a AVB property descriptor

# Appends os version and security patch level as a AVB property descriptor

BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.system.os_version:$(PLATFORM_VERSION) \

    --prop com.android.build.system.security_patch:$(PLATFORM_SECURITY_PATCH)

BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.product.os_version:$(PLATFORM_VERSION) \

    --prop com.android.build.product.security_patch:$(PLATFORM_SECURITY_PATCH)

BOARD_AVB_PRODUCT_SERVICES_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.product_services.os_version:$(PLATFORM_VERSION) \

    --prop com.android.build.product_services.security_patch:$(PLATFORM_SECURITY_PATCH)

# The following vendor- and odm-specific images needs explicitly set per board.

BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.boot.os_version:$(PLATFORM_VERSION)

BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.vendor.os_version:$(PLATFORM_VERSION)

BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.odm.os_version:$(PLATFORM_VERSION)

# The following vendor- and odm-specific images needs explicit SPL set per board.

ifdef BOOT_SECURITY_PATCH

BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.boot.security_patch:$(BOOT_SECURITY_PATCH)