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

Commit 025d5d91 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev

parents 4f3bce89 9afc0d53

core/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -2013,6 +2013,14 @@ $(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL) $(INSTALLED_BOOTIMAGE_TARGET) $(INST 
vbmetaimage-nodeps:

	$(build-vbmetaimage-target)



else ifeq (true,$(BOARD_BUILD_DISABLED_VBMETAIMAGE))

BUILT_DISABLED_VBMETAIMAGE := $(PRODUCT_OUT)/vbmeta.img



INSTALLED_VBMETAIMAGE_TARGET := $(BUILT_DISABLED_VBMETAIMAGE)

$(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL)

	$(hide) $(AVBTOOL) make_vbmeta_image \

	  --flag 2 --padding_size 4096 --output $@



endif # BOARD_AVB_ENABLE



# -----------------------------------------------------------------

target/product/treble_common.mk

+10 −0
Original line number Diff line number Diff line
@@ -216,3 +216,13 @@ PRODUCT_PACKAGES += \ 
#   Android O.

PRODUCT_PACKAGES += \

    netutils-wrapper-1.0



# Android Verified Boot (AVB):

#   Builds a special vbmeta.img that disables AVB verification.

#   Otherwise, AVB will prevent the device from booting the generic system.img.

#   Also checks that BOARD_AVB_ENABLE is not set, to prevent adding verity

#   metadata into system.img.

ifeq ($(BOARD_AVB_ENABLE),true)

$(error BOARD_AVB_ENABLE cannot be set for Treble GSI)

endif

BOARD_BUILD_DISABLED_VBMETAIMAGE := true