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

Commit 2bde9a84 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" am: ace5d21b am:... 

Merge "Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT" am: ace5d21b am: 05f36ecf am: 44e5b279 am: 0daa4c45

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

Change-Id: Ic122d1ed571c06a7182ffb9b22808fb1f888a94b
parents 316e5cc7 0daa4c45

core/board_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -106,10 +106,13 @@ _board_strip_readonly_list += \ 
#   contains a kernel or not.

# - BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT controls whether ramdisk

#   recovery resources are built to vendor_boot.

# - BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT controls whether GSI AVB keys are

#   built to vendor_boot.

_board_strip_readonly_list += \

  BOARD_USES_GENERIC_KERNEL_IMAGE \

  BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE \

  BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT \

  BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT \



_build_broken_var_list := \

  BUILD_BROKEN_DUP_RULES \
@@ -773,6 +776,9 @@ 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.