Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60d85b4c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994... 

Merge "Adding BOOT_OS_VERSION for the AVB prop in a boot.img" am: 3f852994 am: fb9c2f22 am: cc08c91f

Original change: https://android-review.googlesource.com/c/platform/build/+/1993718

Change-Id: Iac65ded6e2f65bc1c2a13af61b90a6cebdfa6c76
parents 278dff30 cc08c91f

core/Makefile

+9 −2
Original line number Diff line number Diff line
@@ -3843,8 +3843,7 @@ BOARD_AVB_SYSTEM_EXT_ADD_HASHTREE_FOOTER_ARGS += \ 
    --prop com.android.build.system_ext.security_patch:$(PLATFORM_SECURITY_PATCH)



BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

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

    --prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE)



BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.init_boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
@@ -3885,6 +3884,14 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \ 
# The following vendor- and odm-specific images needs explicit SPL set per board.

# TODO(b/210875415) Is this security_patch property used? Should it be removed from

# boot.img when there is no platform ramdisk included in it?

ifdef BOOT_OS_VERSION

BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

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

else

BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

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

endif



ifdef BOOT_SECURITY_PATCH

BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

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