commit b5e98829398799c6f47d8eb0d99fdf385e5130e0
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 08 00:34:22 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 08 00:34:22 2020 +0000
tree 2674bdd80e4f7985fca47267bb2f98ab084b8462
parent d7bf548967798a8da3001dc46524d30f7283ba05
parent 8f52a568f07fca12a3d2d3275e6de5948f0add90

Merge "Enable debug ramdisk for vendor_boot with recovery"

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index d674d1a..1a80348 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -310,7 +310,8 @@
 
 ###########################################
 # Now we can substitute with the real value of TARGET_COPY_OUT_DEBUG_RAMDISK
-ifneq (,$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT) $(BOARD_GKI_NONAB_COMPAT)))
+ifneq (,$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT) \
+  $(BOARD_GKI_NONAB_COMPAT) $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT)))
 TARGET_COPY_OUT_DEBUG_RAMDISK := debug_ramdisk/first_stage_ramdisk
 TARGET_COPY_OUT_VENDOR_DEBUG_RAMDISK := vendor_debug_ramdisk/first_stage_ramdisk
 TARGET_COPY_OUT_TEST_HARNESS_RAMDISK := test_harness_ramdisk/first_stage_ramdisk