Merge "Dist ramdisk-recovery.img and misc_info.txt" am: b581214e65 am: aa64af5c71

Change-Id: I3002e62d53c4d21d3dcc26269583782048a1a047
This commit is contained in:
Automerger Merge Worker 2019-12-23 18:53:38 +00:00
commit 3ff4bb8205
2 changed files with 3 additions and 0 deletions

View file

@ -2124,6 +2124,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \
$(recovery_fstab) $(recovery_fstab)
$(call pretty,"Target boot image from recovery: $@") $(call pretty,"Target boot image from recovery: $@")
$(call build-recoveryimage-target, $@) $(call build-recoveryimage-target, $@)
$(INSTALLED_BOOTIMAGE_TARGET): .KATI_IMPLICIT_OUTPUTS += $(recovery_ramdisk)
endif # BOARD_USES_RECOVERY_AS_BOOT endif # BOARD_USES_RECOVERY_AS_BOOT
ifdef BOARD_INCLUDE_RECOVERY_DTBO ifdef BOARD_INCLUDE_RECOVERY_DTBO

View file

@ -1526,7 +1526,9 @@ else # TARGET_BUILD_APPS
$(INSTALLED_BUILD_PROP_TARGET) \ $(INSTALLED_BUILD_PROP_TARGET) \
$(BUILT_TARGET_FILES_PACKAGE) \ $(BUILT_TARGET_FILES_PACKAGE) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_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.