Revert "[res] Better modification time resolution in Idmap"
This reverts commit fff1d48f432741160019a9266728097f10bd2189.
Reason for revert: <Potential culprit for b/365676142 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>
Change-Id: I6b0a0bd67a14e4738a8cd64be2214840d02eee3f
diff --git a/libs/androidfw/misc.cpp b/libs/androidfw/misc.cpp
index 9bdaf18a..93dcaf5 100644
--- a/libs/androidfw/misc.cpp
+++ b/libs/androidfw/misc.cpp
@@ -28,13 +28,11 @@
#include <sys/vfs.h>
#endif // __linux__
+#include <cstring>
+#include <cstdio>
#include <errno.h>
#include <sys/stat.h>
-#include <cstdio>
-#include <cstring>
-#include <tuple>
-
namespace android {
/*
@@ -75,32 +73,27 @@
}
}
-static ModDate getModDate(const struct stat& st) {
-#ifdef _WIN32
- return st.st_mtime;
-#else
- return st.st_mtim;
-#endif
+/*
+ * Get a file's modification date.
+ */
+time_t getFileModDate(const char* fileName) {
+ struct stat sb;
+ if (stat(fileName, &sb) < 0) {
+ return (time_t)-1;
+ }
+ return sb.st_mtime;
}
-ModDate getFileModDate(const char* fileName) {
- struct stat sb;
- if (stat(fileName, &sb) < 0) {
- return kInvalidModDate;
- }
- return getModDate(sb);
-}
-
-ModDate getFileModDate(int fd) {
- struct stat sb;
- if (fstat(fd, &sb) < 0) {
- return kInvalidModDate;
- }
- if (sb.st_nlink <= 0) {
- errno = ENOENT;
- return kInvalidModDate;
- }
- return getModDate(sb);
+time_t getFileModDate(int fd) {
+ struct stat sb;
+ if (fstat(fd, &sb) < 0) {
+ return (time_t)-1;
+ }
+ if (sb.st_nlink <= 0) {
+ errno = ENOENT;
+ return (time_t)-1;
+ }
+ return sb.st_mtime;
}
#ifndef __linux__
@@ -131,8 +124,4 @@
}
#endif // __linux__
-} // namespace android
-
-bool operator==(const timespec& l, const timespec& r) {
- return std::tie(l.tv_sec, l.tv_nsec) == std::tie(r.tv_sec, l.tv_nsec);
-}
+}; // namespace android