commit b4b7c5abffe07f350fed126ba0a9b204ff3c236f
author Jorge Lucangeli Obes <jorgelo@google.com> Mon Sep 09 10:47:36 2019 -0400
committer Jorge Lucangeli Obes <jorgelo@google.com> Mon Sep 09 10:54:23 2019 -0400
tree a6341ade89774e13a717bbca126d4ec1f79306fe
parent 7654c6e08182573a47b4ced79340af17dadadadc

Revert "Fix RO-remount logic for bindmounts"

We have been unable to uprev Minijail in Chrome OS since this CL
landed. Even after
https://android-review.googlesource.com/c/platform/external/minijail/+/1108653,
this CL reliably breaks the arc.Boot Tast test. Revert temporarily to
allow a Minijail uprev required for bug fixes.

Bug: crbug.com/985467
Test: Build, deploy on Chrome OS, arc.Boot passes.

This reverts commit 64cf3cbb6e8c3d656304944c8c8f327b6ec71aaa.

Change-Id: I022ee376b4a09f57a0511d7d9bfd48959b04406b

system_unittest.cc

diff --git a/system_unittest.cc b/system_unittest.cc
index 07a343c..470421d 100644
--- a/system_unittest.cc
+++ b/system_unittest.cc
@@ -273,7 +273,7 @@
   std::string proc = dir.path + "/proc";
   EXPECT_EQ(0, setup_mount_destination("/proc", proc.c_str(), -1, -1, true,
                                        &mount_flags));
-  EXPECT_EQ(vfs_flags_to_mount_flags(stvfs_buf.f_flag), mount_flags);
+  EXPECT_EQ(stvfs_buf.f_flag, mount_flags);
   EXPECT_EQ(0, rmdir(proc.c_str()));
 
   // Same thing holds for children of a mount.
@@ -281,7 +281,7 @@
   std::string proc_self = dir.path + "/proc_self";
   EXPECT_EQ(0, setup_mount_destination("/proc/self", proc_self.c_str(), -1, -1,
                                        true, &mount_flags));
-  EXPECT_EQ(vfs_flags_to_mount_flags(stvfs_buf.f_flag), mount_flags);
+  EXPECT_EQ(stvfs_buf.f_flag, mount_flags);
   EXPECT_EQ(0, rmdir(proc_self.c_str()));
 }