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

Commit 7c93b441 authored by Gabriele M's avatar Gabriele M Committed by Zhao Wei Liew
Browse files

ota_from_target_files: Remove device dependent arguments 

These device-specific arguments are defined at build time and are
necessary to generate the zip correctly. Don't use command line
arguments to specify them, but write all the needed information
in misc_info.txt when the target-files zip is generated.
ota_from_target_files will then read misc_info.txt and set
everything automatically.

Change-Id: Ibdbca575b76eb07b53fccfcea52a351c7e333f91
parent 9b1da126

core/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -2132,6 +2132,8 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE 
else

	$(hide) vendor/cm/build/tools/getb64key.py $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt

endif

	$(hide) echo "ota_override_device=$(OTA_SCRIPT_OVERRIDE_DEVICE)" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "ota_override_prop=$(OTA_SCRIPT_OVERRIDE_PROP)" >> $(zip_root)/META/misc_info.txt

	@# Zip everything up, preserving symlinks and placing META/ files first to

	@# help early validation of the .zip file while uploading it.

	$(hide) (cd $(zip_root) && \
@@ -2193,15 +2195,15 @@ endif 
endif



ifeq ($(TARGET_OTA_ASSERT_DEVICE),)

    $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto

    OTA_SCRIPT_OVERRIDE_DEVICE := auto

else

    $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE)

    OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE)

endif



ifneq ($(TARGET_UNIFIED_DEVICE),)

    $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := --override_prop=true

    OTA_SCRIPT_OVERRIDE_PROP := true

    ifeq ($(TARGET_OTA_ASSERT_DEVICE),)

        $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_DEVICE)

        OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE)

    endif

endif
@@ -2211,7 +2213,6 @@ endif 


$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)

	@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path

	@echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device

	@echo "Package OTA: $@"

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	   $(OTA_FROM_TARGET_SCRIPT) -v \
@@ -2219,7 +2220,6 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) 
	   -p $(HOST_OUT) \

	   -k $(KEY_CERT_PAIR) \

	   --backup=$(backuptool) \

	   --override_device=$(override_device) $(override_prop) \

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

	   $(BUILT_TARGET_FILES_PACKAGE) $@

tools/releasetools/ota_from_target_files.py

+6 −14
Original line number Diff line number Diff line
@@ -128,13 +128,6 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
  --backup <boolean>

      Enable or disable the execution of backuptool.sh.

      Disabled by default.



  --override_device <device>

      Override device-specific asserts. Can be a comma-separated list.



  --override_prop <boolean>

      Override build.prop items with custom vendor init.

      Enabled when TARGET_UNIFIED_DEVICE is defined in BoardConfig

"""



import sys
@@ -2041,10 +2034,6 @@ def main(argv): 
      OPTIONS.payload_signer_args = shlex.split(a)

    elif o in ("--backup"):

      OPTIONS.backuptool = bool(a.lower() == 'true')

    elif o in ("--override_device"):

      OPTIONS.override_device = a

    elif o in ("--override_prop"):

      OPTIONS.override_prop = bool(a.lower() == 'true')

    else:

      return False

    return True
@@ -2076,9 +2065,7 @@ def main(argv): 
                                 "log_diff=",

                                 "payload_signer=",

                                 "payload_signer_args=",

                                 "backup=",

                                 "override_device=",

                                 "override_prop="

                                 "backup="

                             ], extra_option_handler=option_handler)



  if len(args) != 2:
@@ -2103,6 +2090,11 @@ def main(argv): 
  OPTIONS.info_dict = common.LoadInfoDict(input_zip)

  common.ZipClose(input_zip)



  if "ota_override_device" in OPTIONS.info_dict:

    OPTIONS.override_device = OPTIONS.info_dict.get("ota_override_device")

  if "ota_override_prop" in OPTIONS.info_dict:

    OPTIONS.override_prop = OPTIONS.info_dict.get("ota_override_prop") == "true"



  ab_update = OPTIONS.info_dict.get("ab_update") == "true"



  if ab_update: