Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Debug Code"

Browse Source
This commit is contained in:
Xavier Ducrohet
2011-07-27 18:26:01 -07:00
committed by Android Code Review
parent 4d1fa60bfe 7a09ccfb50
commit 20339b2439
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/aapt/FileFinder.cpp
View File

@@ -9,7 +9,6 @@
#include <utils/String8.h> #include <utils/String8.h>
#include <utils/KeyedVector.h> #include <utils/KeyedVector.h>
#include <iostream>
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -19,8 +18,6 @@
//#define DEBUG //#define DEBUG
using android::String8; using android::String8;
using std::cout;
using std::endl;
// Private function to check whether a file is a directory or not // Private function to check whether a file is a directory or not
bool isDirectory(const char* filename) { bool isDirectory(const char* filename) {
@@ -50,9 +47,6 @@ bool SystemFileFinder::findFiles(String8 basePath, Vector<String8>& extensions,
if (!dw->openDir(basePath)) { if (!dw->openDir(basePath)) {
return false; return false;
} }
#ifdef DEBUG
cout << "FileFinder looking in " << basePath << endl;
#endif // DEBUG
/* /*
* Go through all directory entries. Check each file using checkAndAddFile * Go through all directory entries. Check each file using checkAndAddFile
* and recurse into sub-directories. * and recurse into sub-directories.
@@ -87,9 +81,6 @@ void SystemFileFinder::checkAndAddFile(String8 path, const struct stat* stats,
Vector<String8>& extensions, Vector<String8>& extensions,
KeyedVector<String8,time_t>& fileStore) KeyedVector<String8,time_t>& fileStore)
{ {
#ifdef DEBUG
cout << "Checking file " << path << "...";
#endif // DEBUG
// Loop over the extensions, checking for a match // Loop over the extensions, checking for a match
bool done = false; bool done = false;
String8 ext(path.getPathExtension()); String8 ext(path.getPathExtension());
@@ -99,15 +90,9 @@ void SystemFileFinder::checkAndAddFile(String8 path, const struct stat* stats,
ext2.toLower(); ext2.toLower();
// Compare the extensions. If a match is found, add to storage. // Compare the extensions. If a match is found, add to storage.
if (ext == ext2) { if (ext == ext2) {
#ifdef DEBUG
cout << "Match";
#endif // DEBUG
done = true; done = true;
fileStore.add(path,stats->st_mtime); fileStore.add(path,stats->st_mtime);
} }
} }
#ifdef DEBUG
cout << endl;
#endif //DEBUG
} }