commit 6ec942a0cbb3cb7b0dc3cdf00e14fd737c1fb368
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 22 22:17:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 22 22:17:22 2024 +0000
tree c26f66bcbc55fed68c17e73637cfca42bacc4778
parent e400d09c83aec59d920875a31bfff1d07e49911e
parent 0701fed364e57ba7cb085c297ffe4641449c3d86

Merge "Remove no longer necessary MS_LAZYTIME definitions." into main

fs_mgr/libfstab/fstab.cpp

diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp
index ca35990..01e0e3d 100644
--- a/fs_mgr/libfstab/fstab.cpp
+++ b/fs_mgr/libfstab/fstab.cpp
@@ -39,10 +39,6 @@
 #include "fstab_priv.h"
 #include "logging_macros.h"
 
-#if !defined(MS_LAZYTIME)
-#define MS_LAZYTIME (1 << 25)
-#endif
-
 using android::base::EndsWith;
 using android::base::ParseByteCount;
 using android::base::ParseInt;

fs_mgr/tests/fs_mgr_test.cpp

diff --git a/fs_mgr/tests/fs_mgr_test.cpp b/fs_mgr/tests/fs_mgr_test.cpp
index 6e050cf..8004977 100644
--- a/fs_mgr/tests/fs_mgr_test.cpp
+++ b/fs_mgr/tests/fs_mgr_test.cpp
@@ -37,10 +37,6 @@
 using namespace android::fs_mgr;
 using namespace testing;
 
-#if !defined(MS_LAZYTIME)
-#define MS_LAZYTIME (1 << 25)
-#endif
-
 namespace {
 
 const std::string cmdline =