commit 3a3019199c64e5bea2e01e8ce8283a2ee36a624c
author Tianjie Xu <xunchang@google.com> Wed Jul 19 23:14:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 19 23:14:51 2017 +0000
tree 38c38831f3a8bff345a92e1e8e85bfa57db480b7
parent f7cc0e0cfb61f704b1a70c4c43fa0697bca2c04a
parent f2a279adb556649d41cd7750e22be1cc6bce62e5

Merge "Fix the android-cloexec-* warnings in bootable/recovery" am: 94a8ea1797 am: 6d8827e0d3 am: 96b5bb9601
am: f2a279adb5

Change-Id: I85c1b30fe78f99a935a19ba28d02841f68216226

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index e98dfd4..c4afd5d 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -260,8 +260,6 @@
           if (result == 0 && directory != nullptr) {
             const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static",
                                              "-e",
-                                             "-S",
-                                             "/file_contexts",
                                              "-f",
                                              directory,
                                              "-a",
@@ -270,7 +268,7 @@
                                              nullptr };
 
             result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
-            }
+          }
         } else {   /* Has to be f2fs because we checked earlier. */
             if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {
                 LOG(ERROR) << "format_volume: crypt footer + negative length (" << length

updater/install.cpp

diff --git a/updater/install.cpp b/updater/install.cpp
index c9a3a07..bfe91e7 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -322,8 +322,7 @@
       return StringValue(location);
     }
 
-    const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e",   "-S",
-                                     "/file_contexts",         "-a",   mount_point.c_str(),
+    const char* e2fsdroid_argv[] = { "/sbin/e2fsdroid_static", "-e",   "-a", mount_point.c_str(),
                                      location.c_str(),         nullptr };
     status = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));
     if (status != 0) {