diff options
| author | Raphael <raphael@google.com> | 2009-09-24 15:30:53 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2009-09-24 15:30:53 -0700 |
| commit | 3cdfc042dca4264bdd2e51320f7edb81fd8f9ee0 (patch) | |
| tree | 7607902e234f71672c065407d407c7e871d53626 | |
| parent | b87f24a6a88a994256ca97b69904af28824bc9ce (diff) | |
| download | frameworks_base-3cdfc042dca4264bdd2e51320f7edb81fd8f9ee0.zip frameworks_base-3cdfc042dca4264bdd2e51320f7edb81fd8f9ee0.tar.gz frameworks_base-3cdfc042dca4264bdd2e51320f7edb81fd8f9ee0.tar.bz2 | |
AAPT: Ignore visual source safe files in resources
BUG 1895888
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 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; |