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

Commit 6af48c83 authored by Daniel Norman's avatar Daniel Norman
Browse files

Allows GSI AVB keys on vendor boot even when not building vendor boot. 

This allows system-only builds (which disable vendor images) to inherit
from device makefiles that normally place GSI AVB keys on vendor boot.

Bug: 175594737
Test: lunch system-only build, m, observe warning not failure
Change-Id: Ib6c199d0a47b3b3be2143241d83ab586966cfd1e
parent 999779bd

core/board_config.mk

+0 −3
Original line number Diff line number Diff line
@@ -777,9 +777,6 @@ ifndef BUILDING_VENDOR_BOOT_IMAGE 
  ifeq (true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))

    $(error Should not set BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT if not building vendor_boot image)

  endif

  ifeq (true,$(BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT))

    $(error Should not set BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT if not building vendor_boot image)

  endif

endif



# If BOARD_USES_GENERIC_KERNEL_IMAGE is set, BOARD_USES_RECOVERY_AS_BOOT must not be set.