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

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

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

Merge "Allows GSI AVB keys on vendor boot even when not building vendor boot." am: a25382e5 am: bcbd8a7c am: b73e57cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8624593259e9d5b091d018e9ce147f25cc95a577
parents 6af2e393 b73e57cc

core/board_config.mk

+0 −3
Original line number Diff line number Diff line
@@ -787,9 +787,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.