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

am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair

Browse Source 
Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.
This commit is contained in:
Ying Wang
2010-01-21 11:12:29 -08:00
committed by Android Git Automerger
parent 1f2f23bd16 6f9e2c648c
commit 6efe03b19e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/aapt/Resource.cpp
View File

@@ -1831,10 +1831,16 @@ status_t
writeProguardForLayouts(ProguardKeepSet* keep, const sp<AaptAssets>& assets)
{
status_t err;
sp<AaptDir> layout = assets->resDir(String8("layout"));
const Vector<sp<AaptDir> >& dirs = assets->resDirs();
const size_t K = dirs.size();
for (size_t k=0; k<K; k++) {
const sp<AaptDir>& d = dirs.itemAt(k);
const String8& dirName = d->getLeaf();
if ((dirName != String8("layout")) && (strncmp(dirName.string(), "layout-", 7) != 0)) {
continue;
}
if (layout != NULL) {
const KeyedVector<String8,sp<AaptGroup> > groups = layout->getFiles();
const KeyedVector<String8,sp<AaptGroup> > groups = d->getFiles();
const size_t N = groups.size();
for (size_t i=0; i<N; i++) {
const sp<AaptGroup>& group = groups.valueAt(i);