diff options
| author | 2019-05-16 11:27:31 +0000 | |
|---|---|---|
| committer | 2019-05-16 11:27:31 +0000 | |
| commit | 196f64bc6bac55b42a4e8c27f16c821a2c500b9b (patch) | |
| tree | b643db1611d1efb92aa4251d4243c3e0bffc18a1 | |
| parent | 85fba4c04acf8272fc81e8b5221293741a755c2e (diff) | |
| parent | 9b54801b5865e4e09266c272222dfff70e0aac93 (diff) | |
Merge "Appending per-partition os_version into AVB props"
| -rw-r--r-- | core/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index bbd7426c6d..57a05d4b1a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3067,18 +3067,30 @@ ifneq ($(words $(sort $(INTERNAL_AVB_PARTITIONS_IN_CHAINED_VBMETA_IMAGES))),$(wo $(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) |