commit 338be53ed30fc79a34b7e6c80dde7b3cde0d9f84
author Tao Bao <tbao@google.com> Tue Jul 11 16:45:04 2017 -0700
committer Tao Bao <tbao@google.com> Sat Jul 22 16:16:21 2017 -0700
tree 553bd11eeebf1cbe4d25f6b541a75bbc6db2bea7
parent 9187f1cc51cc04155754d0ed34a5fc875acb9af4

Remove the obsolete reference to /file_contexts.

This file no longer exists:
- /file_contexts has been split into plat_file_contexts and
  nonplat_file_contexts since commit
  b236eb6ca204cefcb926e19bd5682f9dcad4021d (system/sepolicy).
- It was named /file_contexts.bin prior to the split.

'-S file_contexts' is also no longer required by e2fsdroid, since commit
2fff6fb036cbbb6dedd7da3d208b312a9038a5ce (external/e2fsprogs). It will
load the file contexts via libselinux.

Test: Trigger the path by performing a data wipe for converting to FBE.
Change-Id: I179939da409e5c0415ae0ea0bf5ddb23f9e6331e
(cherry picked from commit 7af933b6a6fd687bd17710ef6fda0ad5483e4d6d)

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