diff options
| author | Bowgo Tsai <bowgotsai@google.com> | 2022-06-07 11:36:35 +0800 |
|---|---|---|
| committer | Bowgo Tsai <bowgotsai@google.com> | 2022-06-07 11:36:35 +0800 |
| commit | c85a201d5e7379deffb0d805f089349302fb5d4a (patch) | |
| tree | 2f140628c1e79905c1a6b7539d5955bb5211df0a | |
| parent | 10714789a95f7eab6313d7e6ef466cf1b342abfe (diff) | |
| download | build-c85a201d5e7379deffb0d805f089349302fb5d4a.tar.gz | |
Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img
The value of BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS and
BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS are usually the same, e.g.,
--padding_size 4096 --rollback_index 1656979200.
However, in a split build, the value of
BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS might be empty.
Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS to correctly
assign the value for vbmeta_vendor.img.
Bug: 232360330
Test: TreeHugger
Change-Id: Ia26816bd309084c3a4c0df6b9f2f3fc5a28bc31a
| -rw-r--r-- | core/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index a6f6dd2568..86324cb48f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5238,7 +5238,7 @@ ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM))) endif # BOARD_AVB_VBMETA_SYSTEM ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR))) $(hide) echo "avb_vbmeta_vendor=$(BOARD_AVB_VBMETA_VENDOR)" >> $@ - $(hide) echo "avb_vbmeta_vendor_args=$(BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS)" >> $@ + $(hide) echo "avb_vbmeta_vendor_args=$(BOARD_AVB_MAKE_VBMETA_VENDOR_IMAGE_ARGS)" >> $@ $(hide) echo "avb_vbmeta_vendor_key_path=$(BOARD_AVB_VBMETA_VENDOR_KEY_PATH)" >> $@ $(hide) echo "avb_vbmeta_vendor_algorithm=$(BOARD_AVB_VBMETA_VENDOR_ALGORITHM)" >> $@ $(hide) echo "avb_vbmeta_vendor_rollback_index_location=$(BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION)" >> $@ |