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

Commit 89c8092f authored by Simon Shields's avatar Simon Shields Committed by Rashed Abdel-Tawab
Browse files

edify: bring back SetPermissionsRecursive 

* we still need this, even with block-based OTAs.

This partially reverts commit f388104e

Change-Id: I4943e2e89ee5c810a63746c570dc5e31e95b8c53
parent 9d1fec6a

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2464,6 +2464,7 @@ ifdef PRODUCT_EXTRA_RECOVERY_KEYS 
endif

	$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt

	$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $(zip_root)/META/misc_info.txt

	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "blockimgdiff_versions=3,4" >> $(zip_root)/META/misc_info.txt

ifneq ($(OEM_THUMBPRINT_PROPERTIES),)

tools/releasetools/edify_generator.py

+17 −0
Original line number Diff line number Diff line
@@ -298,6 +298,23 @@ class EdifyGenerator(object): 
    cmd = "".join(cmd)

    self.script.append(self.WordWrap(cmd))



  def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode, selabel,

                              capabilities):

    """Recursively set path ownership and permissions."""

    if not self.info.get("use_set_metadata", False):

      self.script.append('set_perm_recursive(%d, %d, 0%o, 0%o, "%s");'

                         % (uid, gid, dmode, fmode, fn))

    else:

      if capabilities is None:

        capabilities = "0x0"

      cmd = 'set_metadata_recursive("%s", "uid", %d, "gid", %d, ' \

          '"dmode", 0%o, "fmode", 0%o, "capabilities", %s' \

          % (fn, uid, gid, dmode, fmode, capabilities)

      if selabel is not None:

        cmd += ', "selabel", "%s"' % selabel

      cmd += ');'

      self.script.append(cmd)



  def WriteRawImage(self, mount_point, fn, mapfn=None):

    """Write the given package file into the partition for the given

    mount point."""