am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
diff --git a/tools/aapt/FileFinder.cpp b/tools/aapt/FileFinder.cpp
index a1f64d0..580528d 100644
--- a/tools/aapt/FileFinder.cpp
+++ b/tools/aapt/FileFinder.cpp
@@ -9,8 +9,9 @@
#include <utils/String8.h>
#include <utils/KeyedVector.h>
-
#include <iostream>
+#include <dirent.h>
+#include <sys/stat.h>
#include "DirectoryWalker.h"
#include "FileFinder.h"
@@ -21,6 +22,25 @@
using std::cout;
using std::endl;
+// Private function to check whether a file is a directory or not
+bool isDirectory(const char* filename) {
+ struct stat fileStat;
+ if (stat(filename, &fileStat) == -1) {
+ return false;
+ }
+ return(S_ISDIR(fileStat.st_mode));
+}
+
+
+// Private function to check whether a file is a regular file or not
+bool isFile(const char* filename) {
+ struct stat fileStat;
+ if (stat(filename, &fileStat) == -1) {
+ return false;
+ }
+ return(S_ISREG(fileStat.st_mode));
+}
+
bool SystemFileFinder::findFiles(String8 basePath, Vector<String8>& extensions,
KeyedVector<String8,time_t>& fileStore,
DirectoryWalker* dw)
@@ -45,14 +65,14 @@
String8 fullPath = basePath.appendPathCopy(entryName);
// If this entry is a directory we'll recurse into it
- if (entry->d_type == DT_DIR) {
+ if (isDirectory(fullPath.string()) ) {
DirectoryWalker* copy = dw->clone();
findFiles(fullPath, extensions, fileStore,copy);
delete copy;
}
// If this entry is a file, we'll pass it over to checkAndAddFile
- if (entry->d_type == DT_REG) {
+ if (isFile(fullPath.string()) ) {
checkAndAddFile(fullPath,dw->entryStats(),extensions,fileStore);
}
}
@@ -89,4 +109,5 @@
#ifdef DEBUG
cout << endl;
#endif //DEBUG
-}
\ No newline at end of file
+}
+
diff --git a/tools/aapt/FileFinder.h b/tools/aapt/FileFinder.h
index 3f87aba..6974aee 100644
--- a/tools/aapt/FileFinder.h
+++ b/tools/aapt/FileFinder.h
@@ -25,6 +25,8 @@
virtual bool findFiles(String8 basePath, Vector<String8>& extensions,
KeyedVector<String8,time_t>& fileStore,
DirectoryWalker* dw) = 0;
+
+ virtual ~FileFinder() {};
};
class SystemFileFinder : public FileFinder {