From 5a8feb54220f5bb12fac07f4f9a77948067458e3 Mon Sep 17 00:00:00 2001
From: Daniel Mentz <danielmentz@google.com>
Date: Mon, 23 Dec 2019 14:06:20 -0800
Subject: [PATCH] Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT

Bug: 146798070
Change-Id: I9e9d313b8ca097b4930fc2c99800772c6bdcbb9e
---
 core/main.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index e7338953f..e24065c52 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1531,7 +1531,6 @@ else # TARGET_BUILD_APPS
     $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
     $(INSTALLED_MISC_INFO_TARGET) \
     $(INSTALLED_RAMDISK_TARGET) \
-    $(recovery_ramdisk) \
    )
 
   # Put a copy of the radio/bootloader files in the dist dir.
@@ -1567,6 +1566,12 @@ else # TARGET_BUILD_APPS
     )
   endif
 
+  ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
+    $(call dist-for-goals, droidcore, \
+      $(recovery_ramdisk) \
+    )
+  endif
+
   ifeq ($(EMMA_INSTRUMENT),true)
     $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET)
     $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))