From 3cdfc042dca4264bdd2e51320f7edb81fd8f9ee0 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 24 Sep 2009 15:30:53 -0700 Subject: [PATCH] AAPT: Ignore visual source safe files in resources BUG 1895888 --- tools/aapt/AaptAssets.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index b6b0e63f19aa6..c346b90d5a84a 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -55,6 +55,7 @@ static bool validateFileName(const char* fileName) static bool isHidden(const char *root, const char *path) { + const char *ext = NULL; 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 ((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;