| commit | 117e6318e766ce1688e0f159c7f0fb2ac3150a15 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 22 23:14:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 23:14:16 2024 +0000 |
| tree | 25063a8118a7bc8d4a74f024791bccea741ac361 | |
| parent | f3691bfac8b75ef45b3146c65558a4c762f8d1d6 [diff] | |
| parent | c733a4ed040e65b610e3a85eafb4e9e49efb068a [diff] |
Merge "Remove no longer necessary MS_LAZYTIME definitions." into main am: 6ec942a0cb am: c733a4ed04 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3370977 Change-Id: Ib1dc454dfd508ab84eda9614ff869b7cf2b36086 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 =