Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a746b56 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

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

am: 6855138e

Change-Id: I986ff8caeaba5dbf29df58a6882e68cd9cde1e51
parents a54ec9bc 6855138e

core/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -4265,12 +4265,12 @@ ifeq ($(build_ota_package),true) 
# $(1): output file

# $(2): additional args

define build-ota-package-target

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

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

   --block \

PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \

    build/make/tools/releasetools/ota_from_target_files \

    --verbose \

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

   -p $(HOST_OUT) \

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

    --path $(HOST_OUT) \

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

    $(2) \

    $(BUILT_TARGET_FILES_PACKAGE) $(1)

endef