Merge "Only dist recovery_ramdisk if BOARD_USES_RECOVERY_AS_BOOT" am: 9de27595ec am: de2634bdf0

Change-Id: I9a2d2b6be6992423ae1f8b2117af616dd5b74cce
This commit is contained in:
Automerger Merge Worker 2019-12-24 00:14:27 +00:00
commit 3648df452f
1 changed files with 6 additions and 1 deletions

View File

@ -1528,7 +1528,6 @@ else # TARGET_BUILD_APPS
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \
$(INSTALLED_MISC_INFO_TARGET) \ $(INSTALLED_MISC_INFO_TARGET) \
$(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \
$(recovery_ramdisk) \
) )
# Put a copy of the radio/bootloader files in the dist dir. # Put a copy of the radio/bootloader files in the dist dir.
@ -1564,6 +1563,12 @@ else # TARGET_BUILD_APPS
) )
endif endif
ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
$(call dist-for-goals, droidcore, \
$(recovery_ramdisk) \
)
endif
ifeq ($(EMMA_INSTRUMENT),true) ifeq ($(EMMA_INSTRUMENT),true)
$(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET) $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET)
$(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL)) $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))