| commit | c733a4ed040e65b610e3a85eafb4e9e49efb068a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 22 22:38:37 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 22:38:37 2024 +0000 |
| tree | c26f66bcbc55fed68c17e73637cfca42bacc4778 | |
| parent | 81c9767cf43aed45b26ff31bcf87a7e2b4805d13 [diff] | |
| parent | 6ec942a0cbb3cb7b0dc3cdf00e14fd737c1fb368 [diff] |
Merge "Remove no longer necessary MS_LAZYTIME definitions." into main am: 6ec942a0cb Original change: https://android-review.googlesource.com/c/platform/system/core/+/3370977 Change-Id: Ibdf9ac99295be87e39adc010425144d3f2980a5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;
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 =