Update system/extras for logwrapper

Test: build
Change-Id: I60bd71671ef18b62f3d4152e3061133eafa935f8

2 files changed, 5 insertions, 7 deletions

diff --git a/libfscrypt/fscrypt.cpp b/libfscrypt/fscrypt.cpp
index 5182afc4..d0950df9 100644
--- a/libfscrypt/fscrypt.cpp
+++ b/libfscrypt/fscrypt.cpp
@@ -51,7 +51,7 @@ static void log_ls(const char* dirname) {
     std::array<const char*, 3> argv = {"ls", "-laZ", dirname};
     int status = 0;
     auto res =
-        android_fork_execvp(argv.size(), const_cast<char**>(argv.data()), &status, false, true);
+        logwrap_fork_execvp(argv.size(), argv.data(), &status, false, LOG_ALOG, false, nullptr);
     if (res != 0) {
         PLOG(ERROR) << argv[0] << " " << argv[1] << " " << argv[2] << "failed";
         return;
diff --git a/tests/fstest/recovery_test.cpp b/tests/fstest/recovery_test.cpp
index 62ca358a..793f8da2 100644
--- a/tests/fstest/recovery_test.cpp
+++ b/tests/fstest/recovery_test.cpp
@@ -217,9 +217,8 @@ class FsRecoveryTest : public ::testing::Test {
       UMOUNT_BIN,
       cache_str,
     };
-    return android_fork_execvp_ext(ARRAY_SIZE(umount_argv), umount_argv,
-                                   NULL, true, LOG_KLOG, false, NULL,
-                                   NULL, 0) >= 0;
+    return logwrap_fork_execvp(ARRAY_SIZE(umount_argv), umount_argv, nullptr,
+                               false, LOG_KLOG, false, nullptr) >= 0;
   }
 
   bool mountAll() {
@@ -230,9 +229,8 @@ class FsRecoveryTest : public ::testing::Test {
       storage_str,
       mountall_str,
     };
-    return android_fork_execvp_ext(ARRAY_SIZE(mountall_argv), mountall_argv,
-                                   NULL, true, LOG_KLOG, false, NULL,
-                                   NULL, 0) >= 0;
+    return logwrap_fork_execvp(ARRAY_SIZE(mountall_argv), mountall_argv, nullptr,
+                               false, LOG_KLOG, false, nullptr) >= 0;
   }
 
   int getCacheBlkFd() {