Merge "Support GKI with non-A/B recovery" (e6f92d14) · Commits · e / os / android_build

core/Makefile

+7 −4

Original line number	Diff line number	Diff line
		@@ -963,6 +963,8 @@ define get-partition-size-argument
		$(if $(1),--partition_size $(1),--dynamic_partition_size)
		endef

		ifndef BOARD_PREBUILT_BOOTIMAGE

		ifneq ($(strip $(TARGET_NO_KERNEL)),true)
		INTERNAL_BOOTIMAGE_ARGS := \
		$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))
		@@ -1180,7 +1182,10 @@ endif # BOARD_AVB_ENABLE
		endif # BUILDING_BOOT_IMAGE

		else # TARGET_NO_KERNEL == "true"
		ifdef BOARD_PREBUILT_BOOTIMAGE
		INSTALLED_BOOTIMAGE_TARGET :=
		endif # TARGET_NO_KERNEL

		else # BOARD_PREBUILT_BOOTIMAGE defined
		INTERNAL_PREBUILT_BOOTIMAGE := $(BOARD_PREBUILT_BOOTIMAGE)
		INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img

		@@ -1202,10 +1207,8 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE)
		cp $(INTERNAL_PREBUILT_BOOTIMAGE) $@
		endif # BOARD_AVB_ENABLE

		else # BOARD_PREBUILT_BOOTIMAGE not defined
		INSTALLED_BOOTIMAGE_TARGET :=
		endif # BOARD_PREBUILT_BOOTIMAGE
		endif # TARGET_NO_KERNEL

		endif # my_installed_prebuilt_gki_apex not defined

		my_apex_extracted_boot_image :=