am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index b6b0e63f19aa67570482bee5c011f469f02c519e..c346b90d5a84a26a9d0f20e4b093025d82ddac67 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -55,6 +55,7 @@ static bool validateFileName(const char* fileName)
 
 static bool isHidden(const char *root, const char *path)
 {
 
 static bool isHidden(const char *root, const char *path)
 {

+    const char *ext  = NULL;

     const char *type = NULL;
 
     // Skip all hidden files.
     const char *type = NULL;
 
     // Skip all hidden files.


@@ -83,6 +84,9 @@ static bool isHidden(const char *root, const char *path)
     } else if (path[strlen(path)-1] == '~') {
         // Skip suspected emacs backup files.
         type = "backup";
     } else if (path[strlen(path)-1] == '~') {
         // Skip suspected emacs backup files.
         type = "backup";

+    } else if ((ext = strrchr(path, '.')) != NULL && strcmp(ext, ".scc") == 0) {
+        // Skip VisualSourceSafe files and don't chatter about it
+        return true;

     } else {
         // Let everything else through.
         return false;
     } else {
         // Let everything else through.
         return false;