commit c56931c1739ef0cbc75fd41e3da9699e5509e1e6
author Yifan Hong <elsk@google.com> Wed Oct 28 16:35:19 2020 -0700
committer Yifan Hong <elsk@google.com> Wed Oct 28 17:05:18 2020 -0700
tree e3931410a87520ae552332cc6747cf3c0bffe7e3
parent 3941a876decdf86db442df36d16e4090e636d8af

Move common code out of the conditional.

Test: builds
Change-Id: I75e13b929dbdb31785a59898579ed14bcc3eef60

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 7d02120..6b1206e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1890,8 +1890,9 @@
 	$(copy-file-to-target)
 endif
 
+INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)
+
 ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(BOARD_USES_RECOVERY_AS_BOOT)))
-  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)
 
 ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))
 ifdef GENERIC_KERNEL_CMDLINE
@@ -1900,9 +1901,7 @@
 endif # BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE != true
 
 else # not (BUILDING_VENDOR_BOOT_IMAGE and BOARD_USES_RECOVERY_AS_BOOT)
-  INTERNAL_RECOVERYIMAGE_ARGS := \
-      $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
-      --ramdisk $(recovery_ramdisk)
+INTERNAL_RECOVERYIMAGE_ARGS += $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))
 # Assumes this has already been stripped
 ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))
 ifdef INTERNAL_KERNEL_CMDLINE