Merge "Stop passing `--block` and MKBOOTIMG to ota_from_target_files."

# $(1): output file

# $(1): output file

# $(2): additional args

# $(2): additional args

define build-ota-package-target

define build-ota-package-target

PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \

PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \

   build/make/tools/releasetools/ota_from_target_files -v \

    build/make/tools/releasetools/ota_from_target_files \

   --block \

    --verbose \

    --extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \

    --extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \

   -p $(HOST_OUT) \

    --path $(HOST_OUT) \

   $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \

    $(if $(OEM_OTA_CONFIG), --oem_settings $(OEM_OTA_CONFIG)) \

    $(2) \

    $(2) \

    $(BUILT_TARGET_FILES_PACKAGE) $(1)

    $(BUILT_TARGET_FILES_PACKAGE) $(1)

endef

endef