From: Xavier Ducrohet <xav@android.com>
Date: Thu, 28 Jul 2011 01:43:32 +0000 (-0700)
Subject: am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/483bf9fcbadc82d390fe91ebf23cd9bf898940a5?hp=0069ad709cb2a8e191066da5010b2d1e182eb79f

am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
  Remove Debug Code
---

diff --git a/FileFinder.cpp b/FileFinder.cpp
index 580528d..18775c0 100644
--- a/FileFinder.cpp
+++ b/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
 }