diff options
| author | Raphael <raphael@google.com> | 2009-09-24 15:45:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-24 15:45:17 -0700 |
| commit | 041653714524b37972169071e7569d2432ae8747 (patch) | |
| tree | f4eed1d13f387220d21b99df895da8ac33663630 /tools | |
| parent | d3d0f03b5a7974ca484b63a57e48ccb987dcc54d (diff) | |
| parent | 20b394719daa218be7ff767fad024504f12e937b (diff) | |
| download | frameworks_base-041653714524b37972169071e7569d2432ae8747.zip frameworks_base-041653714524b37972169071e7569d2432ae8747.tar.gz frameworks_base-041653714524b37972169071e7569d2432ae8747.tar.bz2 | |
am 20b39471: Merge change 26933 into eclair
Merge commit '20b394719daa218be7ff767fad024504f12e937b' into eclair-plus-aosp
* commit '20b394719daa218be7ff767fad024504f12e937b':
AAPT: Ignore visual source safe files in resources
Diffstat (limited to 'tools')
| -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; |