drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-10-03 22:06:02 +00:00
committed by Android (Google) Code Review
parent 76716c5a18 f15de2e215
commit a80aba7072
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt/ResourceTable.cpp
View File

@ -4357,6 +4357,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) {
continue; continue;
} }
if (bundle->getVerbose()) {
entriesToAdd[i].value->getPos() entriesToAdd[i].value->getPos()
.printf("using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.", .printf("using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.",
SDK_L, SDK_L,
@ -4364,6 +4365,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) {
String8(t->getName()).string(), String8(t->getName()).string(),
String8(entriesToAdd[i].value->getName()).string(), String8(entriesToAdd[i].value->getName()).string(),
entriesToAdd[i].key.toString().string()); entriesToAdd[i].key.toString().string());
}
sp<Entry> newEntry = t->getEntry(c->getName(), sp<Entry> newEntry = t->getEntry(c->getName(),
entriesToAdd[i].value->getPos(), entriesToAdd[i].value->getPos(),
@ -4437,6 +4439,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
resPath.convertToResPath(); resPath.convertToResPath();
// Add a resource table entry. // Add a resource table entry.
if (bundle->getVerbose()) {
SourcePos(target->getSourceFile(), -1).printf( SourcePos(target->getSourceFile(), -1).printf(
"using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.", "using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.",
SDK_L, SDK_L,
@ -4444,6 +4447,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
newFile->getResourceType().string(), newFile->getResourceType().string(),
String8(resourceName).string(), String8(resourceName).string(),
newConfig.toString().string()); newConfig.toString().string());
}
addEntry(SourcePos(), addEntry(SourcePos(),
String16(mAssets->getPackage()), String16(mAssets->getPackage()),
@ -4466,12 +4470,14 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
sp<XMLNode> node = attrsToRemove[i].key; sp<XMLNode> node = attrsToRemove[i].key;
size_t attrIndex = attrsToRemove[i].value; size_t attrIndex = attrsToRemove[i].value;
const XMLNode::attribute_entry& ae = node->getAttributes()[attrIndex]; const XMLNode::attribute_entry& ae = node->getAttributes()[attrIndex];
if (bundle->getVerbose()) {
SourcePos(node->getFilename(), node->getStartLineNumber()).printf( SourcePos(node->getFilename(), node->getStartLineNumber()).printf(
"removing attribute %s%s%s from <%s>", "removing attribute %s%s%s from <%s>",
String8(ae.ns).string(), String8(ae.ns).string(),
(ae.ns.size() == 0 ? "" : ":"), (ae.ns.size() == 0 ? "" : ":"),
String8(ae.name).string(), String8(ae.name).string(),
String8(node->getElementName()).string()); String8(node->getElementName()).string());
}
node->removeAttribute(attrIndex); node->removeAttribute(attrIndex);
} }