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

Unverified Commit 99af8128 authored by Brint E. Kriebel's avatar Brint E. Kriebel Committed by Michael Bestas
Browse files

build: Update install tools packaging for target-files support 

Modifies "build: ota: Support for install tools in /tmp/install" to
support signing steps being split from build steps.

Package install files into target-files INSTALL path
Read from target-files for OTA package creation

Change-Id: I64f919c2a757b5474f6cc5f82bd6c33c2a8b558a
parent 55c5936b

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1773,6 +1773,8 @@ ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_ 
	$(hide) mkdir -p $(zip_root)/$(PRIVATE_RECOVERY_OUT)

	$(hide) $(call package_files-copy-root, \

		$(TARGET_RECOVERY_ROOT_OUT),$(zip_root)/$(PRIVATE_RECOVERY_OUT)/RAMDISK)

	@# OTA install helpers

	$(hide) $(call package_files-copy-root, $(OUT)/install, $(zip_root)/INSTALL)

ifdef INSTALLED_KERNEL_TARGET

	$(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/kernel

endif

tools/releasetools/ota_from_target_files.py

+6 −7
Original line number Diff line number Diff line
@@ -540,13 +540,12 @@ def GetImage(which, tmpdir, info_dict): 




def CopyInstallTools(output_zip):

  oldcwd = os.getcwd()

  os.chdir(os.getenv('OUT'))

  for root, subdirs, files in os.walk("install"):

  install_path = os.path.join(OPTIONS.input_tmp, "INSTALL")

  for root, subdirs, files in os.walk(install_path):

     for f in files:

      p = os.path.join(root, f)

      output_zip.write(p, p)

  os.chdir(oldcwd)

      install_source = os.path.join(root, f)

      install_target = os.path.join("install", os.path.relpath(root, install_path), f)

      output_zip.write(install_source, install_target)





def WriteFullOTAPackage(input_zip, output_zip):