diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-17 16:45:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-17 16:45:44 +0000 |
| commit | 61c5d29655518662c71417c1cdffcf0a00a5d08d (patch) | |
| tree | 24a7d9df09b63ed0bd9d34d9d7c455707d50f7c1 | |
| parent | 6e0bc978750136d383f8e248dd4d38cf90a7b7f2 (diff) | |
| parent | ce8b0635075fa5b4749eff0d22397a35ec3904c4 (diff) | |
| download | build-61c5d29655518662c71417c1cdffcf0a00a5d08d.tar.gz | |
Merge "Appending per-partition os_version into AVB props" into qt-dev
| -rw-r--r-- | core/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 4c3d8137f9..8423a50786 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3094,18 +3094,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) |