From 8f52a568f07fca12a3d2d3275e6de5948f0add90 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Fri, 4 Dec 2020 11:05:00 -0800 Subject: [PATCH] Enable debug ramdisk for vendor_boot with recovery The debug vendor boot image needs to include the debug ramdisk in order to retain adb root. So make sure this still happens when recovery is moved to the the vendor boot image. Bug: 172510680 Test: verify adb root when using vendor_boot-debug.img Change-Id: I20fe27635dd33e4d8a59e873e704891de223204b --- core/board_config.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/board_config.mk b/core/board_config.mk index d674d1af48..1a80348469 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -310,7 +310,8 @@ endif ########################################### # 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