diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
| commit | f013e1afd1e68af5e3b868c26a653bbfb39538f8 (patch) | |
| tree | 7ad6c8fd9c7b55f4b4017171dec1cb760bbd26bf /tools/aapt/AaptAssets.cpp | |
| parent | e70cfafe580c6f2994c4827cd8a534aabf3eb05c (diff) | |
| download | frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.zip frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.tar.gz frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index d07e4de..027662d 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -78,7 +78,7 @@ static bool isHidden(const char *root, const char *path) // Skip CVS but don't chatter about it. return true; } else if (strcasecmp(path, "thumbs.db") == 0 - || strcasecmp(path, "picassa.ini") == 0) { + || strcasecmp(path, "picasa.ini") == 0) { // Skip suspected image indexes files. type = "index"; } else if (path[strlen(path)-1] == '~') { @@ -695,6 +695,9 @@ bool AaptGroupEntry::getKeysHiddenName(const char* name, } else if (strcmp(name, "keyshidden") == 0) { mask = out->MASK_KEYSHIDDEN; value = out->KEYSHIDDEN_YES; + } else if (strcmp(name, "keyssoft") == 0) { + mask = out->MASK_KEYSHIDDEN; + value = out->KEYSHIDDEN_SOFT; } if (mask != 0) { |