AAPT: Ignore visual source safe files in resources
BUG 1895888
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index b6b0e63..c346b90 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -55,6 +55,7 @@
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 @@
} 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;