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

Commit 0050955f authored by Tom Marshall's avatar Tom Marshall
Browse files

build: Only set capabilities if provided 

 * Allows OUT/install to be compatibile with K recoveries.

Change-Id: I308ee5759da1e3c8e749e9408793f0720fb83cee
parent 37c39e77

tools/releasetools/edify_generator.py

+8 −6
Original line number Original line Diff line number Diff line
@@ -314,9 +314,10 @@ class EdifyGenerator(object): 
    if not self.info.get("use_set_metadata", False):

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

      self.script.append('set_perm(%d, %d, 0%o, "%s");' % (uid, gid, mode, fn))

      self.script.append('set_perm(%d, %d, 0%o, "%s");' % (uid, gid, mode, fn))

    else:

    else:

      if capabilities is None: capabilities = "0x0"

      cmd = 'set_metadata("%s", "uid", %d, "gid", %d, "mode", 0%o' \

      cmd = 'set_metadata("%s", "uid", %d, "gid", %d, "mode", 0%o, ' \

          % (fn, uid, gid, mode)

          '"capabilities", %s' % (fn, uid, gid, mode, capabilities)

      if capabilities is not None:

        cmd += ', "capabilities", %s' % ( capabilities )

      if selabel is not None:

      if selabel is not None:

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

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

      cmd += ');'

      cmd += ');'
@@ -328,10 +329,11 @@ class EdifyGenerator(object): 
      self.script.append('set_perm_recursive(%d, %d, 0%o, 0%o, "%s");'

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

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

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

    else:

    else:

      if capabilities is None: capabilities = "0x0"

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

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

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

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

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

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

      if capabilities is not None:

        cmd += ', "capabilities", "%s"' % ( capabilities )

      if selabel is not None:

      if selabel is not None:

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

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

      cmd += ');'

      cmd += ');'