Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT"

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))