commit 2545b264be21c70b2c9be0c3d29e47e8bea08ac3
author Tom Marshall <tdm@cyngn.com> Tue Dec 16 09:58:47 2014 -0800
committer Adnan Begovic <adnan@cyngn.com> Tue Oct 06 18:05:33 2015 -0700
tree ae91ae8278cd5f4238462c68c75df47c27fd8ece
parent 317522d5aeaa6b74a807627da25665223f9920ac

build: Only set capabilities if provided

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

Change-Id: I308ee5759da1e3c8e749e9408793f0720fb83cee

tools/releasetools/edify_generator.py

diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 4f25d2d..5d24a6b 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -339,10 +339,10 @@
     if not self.info.get("use_set_metadata", False):
       self.script.append('set_perm(%d, %d, 0%o, "%s");' % (uid, gid, mode, fn))
     else:
-      if capabilities is None:
-        capabilities = "0x0"
-      cmd = 'set_metadata("%s", "uid", %d, "gid", %d, "mode", 0%o, ' \
-          '"capabilities", %s' % (fn, uid, gid, mode, capabilities)
+      cmd = 'set_metadata("%s", "uid", %d, "gid", %d, "mode", 0%o' \
+          % (fn, uid, gid, mode)
+      if capabilities is not None:
+        cmd += ', "capabilities", %s' % ( capabilities )
       if selabel is not None:
         cmd += ', "selabel", "%s"' % selabel
       cmd += ');'
@@ -355,11 +355,11 @@
       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)
+          '"dmode", 0%o, "fmode", 0%o' \
+          % (fn, uid, gid, dmode, fmode)
+      if capabilities is not None:
+        cmd += ', "capabilities", "%s"' % ( capabilities )
       if selabel is not None:
         cmd += ', "selabel", "%s"' % selabel
       cmd += ');'