commit bc50bb88e2e64b3a20c47e56edf7332399f56473
author Bowgo Tsai <bowgotsai@google.com> Mon Mar 29 02:25:12 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 29 02:25:12 2021 +0000
tree 6dbbeaf1f7c6e1942b38a159ddb0d2e5a5bd6408
parent c2e66a69ca2f38c185ef1fd5093e4d1f7e7d7683
parent 099a7c40a7062001d12591b8a4f11d9d2b30b7e5

Merge "GKI: put debugging resources under fisrt_stage_ramdisk subdir."

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 57363fb..a861c29 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -329,7 +329,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) $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT)))
+  $(BOARD_GKI_NONAB_COMPAT) $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT) \
+  $(BOARD_USES_GENERIC_KERNEL_IMAGE)))
 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