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/tools/aapt/Package.cpp b/tools/aapt/Package.cpp
index 60c4bf5..5e0f87f 100644
--- a/tools/aapt/Package.cpp
+++ b/tools/aapt/Package.cpp
@@ -292,12 +292,13 @@
}
if (!hasData) {
const String8& srcName = file->getSourceFile();
- auto fileModWhen = getFileModDate(srcName.c_str());
- if (fileModWhen == kInvalidModDate) { // file existence tested earlier,
- return false; // not expecting an error here
+ time_t fileModWhen;
+ fileModWhen = getFileModDate(srcName.c_str());
+ if (fileModWhen == (time_t) -1) { // file existence tested earlier,
+ return false; // not expecting an error here
}
-
- if (toTimeT(fileModWhen) > entry->getModWhen()) {
+
+ if (fileModWhen > entry->getModWhen()) {
// mark as deleted so add() will succeed
if (bundle->getVerbose()) {
printf(" (removing old '%s')\n", storageName.c_str());