Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 26933 into eclair

Browse Source 
* changes:
  AAPT: Ignore visual source safe files in resources
This commit is contained in:
Android (Google) Code Review
2009-09-24 18:36:37 -04:00
parent b9c932ba12 3cdfc042dc
commit 20b394719d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/AaptAssets.cpp
View File

@@ -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; const char *type = NULL;
// Skip all hidden files. // Skip all hidden files.
@@ -83,6 +84,9 @@ static bool isHidden(const char *root, const char *path)
} else if (path[strlen(path)-1] == '~') { } else if (path[strlen(path)-1] == '~') {
// Skip suspected emacs backup files. // Skip suspected emacs backup files.
type = "backup"; type = "backup";
} else if ((ext = strrchr(path, '.')) != NULL && strcmp(ext, ".scc") == 0) {
// Skip VisualSourceSafe files and don't chatter about it
return true;
} else { } else {
// Let everything else through. // Let everything else through.
return false; return false;