diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-27 18:43:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-27 18:43:32 -0700 |
| commit | 395c86f7f659e3ffc834689576cc738b517d3b9e (patch) | |
| tree | 3081a301646215c02456d4c0b6c8b29e471e2a6f /tools | |
| parent | fcbb4924864976339d5ad8b7adb925d7a050df6a (diff) | |
| parent | 6abf2f501e60132a5369ad5b15b388912c8e9e5b (diff) | |
| download | frameworks_base-395c86f7f659e3ffc834689576cc738b517d3b9e.zip frameworks_base-395c86f7f659e3ffc834689576cc738b517d3b9e.tar.gz frameworks_base-395c86f7f659e3ffc834689576cc738b517d3b9e.tar.bz2 | |
am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
Remove Debug Code
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/FileFinder.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tools/aapt/FileFinder.cpp b/tools/aapt/FileFinder.cpp index 580528d..18775c0 100644 --- a/tools/aapt/FileFinder.cpp +++ b/tools/aapt/FileFinder.cpp @@ -9,7 +9,6 @@ #include <utils/String8.h> #include <utils/KeyedVector.h> -#include <iostream> #include <dirent.h> #include <sys/stat.h> @@ -19,8 +18,6 @@ //#define DEBUG using android::String8; -using std::cout; -using std::endl; // Private function to check whether a file is a directory or not bool isDirectory(const char* filename) { @@ -50,9 +47,6 @@ bool SystemFileFinder::findFiles(String8 basePath, Vector<String8>& extensions, if (!dw->openDir(basePath)) { return false; } -#ifdef DEBUG - cout << "FileFinder looking in " << basePath << endl; -#endif // DEBUG /* * Go through all directory entries. Check each file using checkAndAddFile * and recurse into sub-directories. @@ -87,9 +81,6 @@ void SystemFileFinder::checkAndAddFile(String8 path, const struct stat* stats, Vector<String8>& extensions, KeyedVector<String8,time_t>& fileStore) { -#ifdef DEBUG - cout << "Checking file " << path << "..."; -#endif // DEBUG // Loop over the extensions, checking for a match bool done = false; String8 ext(path.getPathExtension()); @@ -99,15 +90,9 @@ void SystemFileFinder::checkAndAddFile(String8 path, const struct stat* stats, ext2.toLower(); // Compare the extensions. If a match is found, add to storage. if (ext == ext2) { -#ifdef DEBUG - cout << "Match"; -#endif // DEBUG done = true; fileStore.add(path,stats->st_mtime); } } -#ifdef DEBUG - cout << endl; -#endif //DEBUG } |