Revert "Update OTA to understand SELinux filesystem labels"

This reverts commit fbbd79530adc6ddd6bbfb3c5fc60ba5ec0ce5f2d.

All incremental auto OTAs broken b/9964074

Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de

1 files changed, 5 insertions, 5 deletions

diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index cafdeb3..9ef1926 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -217,14 +217,14 @@ class EdifyGenerator(object):
       else:
         raise ValueError("don't know how to write \"%s\" partitions" % (p.fs_type,))
 
-  def SetPermissions(self, fn, uid, gid, mode, secontext):
+  def SetPermissions(self, fn, uid, gid, mode):
     """Set file ownership and permissions."""
-    self.script.append('set_perm2(%d, %d, 0%o, "%s", "%s");' % (uid, gid, mode, secontext, fn))
+    self.script.append('set_perm(%d, %d, 0%o, "%s");' % (uid, gid, mode, fn))
 
-  def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode, secontext):
+  def SetPermissionsRecursive(self, fn, uid, gid, dmode, fmode):
     """Recursively set path ownership and permissions."""
-    self.script.append('set_perm2_recursive(%d, %d, 0%o, 0%o, "%s", "%s");'
-                       % (uid, gid, dmode, fmode, secontext, fn))
+    self.script.append('set_perm_recursive(%d, %d, 0%o, 0%o, "%s");'
+                       % (uid, gid, dmode, fmode, fn))
 
   def MakeSymlinks(self, symlink_list):
     """Create symlinks, given a list of (dest, link) pairs."""