summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2009-05-06 12:55:46 -0400
committer Joe Onorato <joeo@android.com> 2009-05-08 09:33:19 -0700
commit2a98fb9fb1eda1f18cf1555634a7c33f3147234c (patch)
tree9bc7f08736492bedcd162cd85c4c8dae7335ce2a
parentbed158f1def27bf7f5b89cf6f98dff365cf4660a (diff)
fix the sim build. disables the tests for now.
-rw-r--r--include/utils/backup_helpers.h2
-rw-r--r--libs/utils/file_backup_helper.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/utils/backup_helpers.h b/include/utils/backup_helpers.h
index f70444df6d..61bee340db 100644
--- a/include/utils/backup_helpers.h
+++ b/include/utils/backup_helpers.h
@@ -4,7 +4,7 @@
int back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
char const* fileBase, char const* const* files, int fileCount);
-#define TEST_BACKUP_HELPERS 1
+#define TEST_BACKUP_HELPERS 0
#if TEST_BACKUP_HELPERS
int backup_helper_test_empty();
diff --git a/libs/utils/file_backup_helper.cpp b/libs/utils/file_backup_helper.cpp
index 16cbb6ec4e..111f88d9f3 100644
--- a/libs/utils/file_backup_helper.cpp
+++ b/libs/utils/file_backup_helper.cpp
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <utime.h>
#include <fcntl.h>
#include <zlib.h>
@@ -224,7 +225,8 @@ back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
}
s.modTime_sec = st.st_mtime;
- s.modTime_nsec = st.st_mtime_nsec;
+ s.modTime_nsec = 0; // workaround sim breakage
+ //s.modTime_nsec = st.st_mtime_nsec;
s.size = st.st_size;
s.crc32 = compute_crc32(realFilename);