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

am 10f8f111: Merge change 23341 into eclair

Browse Source 
Merge commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088' into eclair-plus-aosp

* commit '10f8f11106ccf492e15ee2a6ba2be99ec4578088':
  Fix replacement-after-add of resource files in overlay.
This commit is contained in:
Robert Greenwalt
2009-08-31 15:20:35 -07:00
committed by Android Git Automerger
parent 78e9389a21 10f8f11106
commit 624a49cf2d
1 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tools/aapt/Resource.cpp
View File

@@ -428,10 +428,15 @@ static void checkForIds(const String8& path, ResXMLParser& parser)
} }
} }
static bool applyFileOverlay(const sp<AaptAssets>& assets, static bool applyFileOverlay(Bundle *bundle,
const sp<AaptAssets>& assets,
const sp<ResourceTypeSet>& baseSet, const sp<ResourceTypeSet>& baseSet,
const char *resType) const char *resType)
{ {
if (bundle->getVerbose()) {
printf("applyFileOverlay for %s\n", resType);
}
// Replace any base level files in this category with any found from the overlay // Replace any base level files in this category with any found from the overlay
// Also add any found only in the overlay. // Also add any found only in the overlay.
sp<AaptAssets> overlay = assets->getOverlay(); sp<AaptAssets> overlay = assets->getOverlay();
@@ -450,6 +455,9 @@ static bool applyFileOverlay(const sp<AaptAssets>& assets,
// non-overlay "baseset". // non-overlay "baseset".
size_t overlayCount = overlaySet->size(); size_t overlayCount = overlaySet->size();
for (size_t overlayIndex=0; overlayIndex<overlayCount; overlayIndex++) { for (size_t overlayIndex=0; overlayIndex<overlayCount; overlayIndex++) {
if (bundle->getVerbose()) {
printf("trying overlaySet Key=%s\n",overlaySet->keyAt(overlayIndex).string());
}
size_t baseIndex = baseSet->indexOfKey(overlaySet->keyAt(overlayIndex)); size_t baseIndex = baseSet->indexOfKey(overlaySet->keyAt(overlayIndex));
if (baseIndex < UNKNOWN_ERROR) { if (baseIndex < UNKNOWN_ERROR) {
// look for same flavor. For a given file (strings.xml, for example) // look for same flavor. For a given file (strings.xml, for example)
@@ -457,18 +465,36 @@ static bool applyFileOverlay(const sp<AaptAssets>& assets,
// the same flavor. // the same flavor.
sp<AaptGroup> overlayGroup = overlaySet->valueAt(overlayIndex); sp<AaptGroup> overlayGroup = overlaySet->valueAt(overlayIndex);
sp<AaptGroup> baseGroup = baseSet->valueAt(baseIndex); sp<AaptGroup> baseGroup = baseSet->valueAt(baseIndex);
DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles = DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > overlayFiles =
baseGroup->getFiles();
DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > overlayFiles =
overlayGroup->getFiles(); overlayGroup->getFiles();
if (bundle->getVerbose()) {
DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles =
baseGroup->getFiles();
for (size_t i=0; i < baseFiles.size(); i++) {
printf("baseFile %d has flavor %s\n", i,
baseFiles.keyAt(i).toString().string());
}
for (size_t i=0; i < overlayFiles.size(); i++) {
printf("overlayFile %d has flavor %s\n", i,
overlayFiles.keyAt(i).toString().string());
}
}
size_t overlayGroupSize = overlayFiles.size(); size_t overlayGroupSize = overlayFiles.size();
for (size_t overlayGroupIndex = 0; for (size_t overlayGroupIndex = 0;
overlayGroupIndex<overlayGroupSize; overlayGroupIndex<overlayGroupSize;
overlayGroupIndex++) { overlayGroupIndex++) {
size_t baseFileIndex = size_t baseFileIndex =
baseFiles.indexOfKey(overlayFiles.keyAt(overlayGroupIndex)); baseGroup->getFiles().indexOfKey(overlayFiles.
keyAt(overlayGroupIndex));
if(baseFileIndex < UNKNOWN_ERROR) { if(baseFileIndex < UNKNOWN_ERROR) {
if (bundle->getVerbose()) {
printf("found a match (%d) for overlay file %s, for flavor %s\n",
baseFileIndex,
overlayGroup->getLeaf().string(),
overlayFiles.keyAt(overlayGroupIndex).toString().string());
}
baseGroup->removeFile(baseFileIndex); baseGroup->removeFile(baseFileIndex);
} else { } else {
// didn't find a match fall through and add it.. // didn't find a match fall through and add it..
@@ -482,11 +508,11 @@ static bool applyFileOverlay(const sp<AaptAssets>& assets,
overlaySet->valueAt(overlayIndex)); overlaySet->valueAt(overlayIndex));
// make sure all flavors are defined in the resources. // make sure all flavors are defined in the resources.
sp<AaptGroup> overlayGroup = overlaySet->valueAt(overlayIndex); sp<AaptGroup> overlayGroup = overlaySet->valueAt(overlayIndex);
DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > overlayFiles = DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > overlayFiles =
overlayGroup->getFiles(); overlayGroup->getFiles();
size_t overlayGroupSize = overlayFiles.size(); size_t overlayGroupSize = overlayFiles.size();
for (size_t overlayGroupIndex = 0; for (size_t overlayGroupIndex = 0;
overlayGroupIndex<overlayGroupSize; overlayGroupIndex<overlayGroupSize;
overlayGroupIndex++) { overlayGroupIndex++) {
assets->addGroupEntry(overlayFiles.keyAt(overlayGroupIndex)); assets->addGroupEntry(overlayFiles.keyAt(overlayGroupIndex));
} }
@@ -623,13 +649,13 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
current = current->getOverlay(); current = current->getOverlay();
} }
// apply the overlay files to the base set // apply the overlay files to the base set
if (!applyFileOverlay(assets, drawables, "drawable") || if (!applyFileOverlay(bundle, assets, drawables, "drawable") ||
!applyFileOverlay(assets, layouts, "layout") || !applyFileOverlay(bundle, assets, layouts, "layout") ||
!applyFileOverlay(assets, anims, "anim") || !applyFileOverlay(bundle, assets, anims, "anim") ||
!applyFileOverlay(assets, xmls, "xml") || !applyFileOverlay(bundle, assets, xmls, "xml") ||
!applyFileOverlay(assets, raws, "raw") || !applyFileOverlay(bundle, assets, raws, "raw") ||
!applyFileOverlay(assets, colors, "color") || !applyFileOverlay(bundle, assets, colors, "color") ||
!applyFileOverlay(assets, menus, "menu")) { !applyFileOverlay(bundle, assets, menus, "menu")) {
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }