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

Commit c9315475 authored by Tao Bao's avatar Tao Bao
Browse files

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

- `--block` has been a no-op since Oreo [1] -- ota_from_target_files
  will always build block-based OTAs or A/B OTAs.
- MKBOOTIMG is no longer needed when calling ota_from_target_files, at
  least for the callsite in Makefile. Because target_files.zip has been
  including boot/recovery images since Lollipop [2].

This CL also switches to long options to improve readability.

[1] commit 457cbf6a
[2] commit 3c84f569

Test: TreeHugger
Change-Id: I801bd0525d2529156bbf783698661d90ba24017a
parent ec53f441

core/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -4264,12 +4264,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