diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-03 22:06:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-03 22:06:03 +0000 |
| commit | a80aba70728c2843df94474dbd7829dadb77855f (patch) | |
| tree | dce444ab177dd84fd98f161776f1979bb372436b | |
| parent | 76716c5a180aa471c6973ca7aa03c7f2da677823 (diff) | |
| parent | f15de2e2151ae48338afd27f3ebd33fce5009103 (diff) | |
| download | frameworks_base-a80aba70728c2843df94474dbd7829dadb77855f.zip frameworks_base-a80aba70728c2843df94474dbd7829dadb77855f.tar.gz frameworks_base-a80aba70728c2843df94474dbd7829dadb77855f.tar.bz2 | |
Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 77d3beb..c003fa6 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4357,13 +4357,15 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) { continue; } - entriesToAdd[i].value->getPos() - .printf("using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.", - SDK_L, - String8(p->getName()).string(), - String8(t->getName()).string(), - String8(entriesToAdd[i].value->getName()).string(), - entriesToAdd[i].key.toString().string()); + if (bundle->getVerbose()) { + entriesToAdd[i].value->getPos() + .printf("using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.", + SDK_L, + String8(p->getName()).string(), + String8(t->getName()).string(), + String8(entriesToAdd[i].value->getName()).string(), + entriesToAdd[i].key.toString().string()); + } sp<Entry> newEntry = t->getEntry(c->getName(), entriesToAdd[i].value->getPos(), @@ -4437,13 +4439,15 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, resPath.convertToResPath(); // Add a resource table entry. - SourcePos(target->getSourceFile(), -1).printf( - "using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.", - SDK_L, - mAssets->getPackage().string(), - newFile->getResourceType().string(), - String8(resourceName).string(), - newConfig.toString().string()); + if (bundle->getVerbose()) { + SourcePos(target->getSourceFile(), -1).printf( + "using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.", + SDK_L, + mAssets->getPackage().string(), + newFile->getResourceType().string(), + String8(resourceName).string(), + newConfig.toString().string()); + } addEntry(SourcePos(), String16(mAssets->getPackage()), @@ -4466,12 +4470,14 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle, sp<XMLNode> node = attrsToRemove[i].key; size_t attrIndex = attrsToRemove[i].value; const XMLNode::attribute_entry& ae = node->getAttributes()[attrIndex]; - SourcePos(node->getFilename(), node->getStartLineNumber()).printf( - "removing attribute %s%s%s from <%s>", - String8(ae.ns).string(), - (ae.ns.size() == 0 ? "" : ":"), - String8(ae.name).string(), - String8(node->getElementName()).string()); + if (bundle->getVerbose()) { + SourcePos(node->getFilename(), node->getStartLineNumber()).printf( + "removing attribute %s%s%s from <%s>", + String8(ae.ns).string(), + (ae.ns.size() == 0 ? "" : ":"), + String8(ae.name).string(), + String8(node->getElementName()).string()); + } node->removeAttribute(attrIndex); } |