diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-04 00:01:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 00:01:21 +0000 |
| commit | 5787920f5bbac1c7cf296b5c042daf0108dbdacc (patch) | |
| tree | 4a461c898612d52da4b5fd268b876cb7dc398886 /tools/aapt | |
| parent | 9f22aef0c9d7d1bd9aecad7ed6e047ea78d3f7c8 (diff) | |
| parent | 85035d90257beedd54641385674ce2dfb29ae241 (diff) | |
| download | frameworks_base-5787920f5bbac1c7cf296b5c042daf0108dbdacc.zip frameworks_base-5787920f5bbac1c7cf296b5c042daf0108dbdacc.tar.gz frameworks_base-5787920f5bbac1c7cf296b5c042daf0108dbdacc.tar.bz2 | |
am 85035d90: am b2b166a5: am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
* commit '85035d90257beedd54641385674ce2dfb29ae241':
AAPT: Gate v21 resource synthesizing logging behind -v flag
Diffstat (limited to 'tools/aapt')
| -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 4b9981d..a0f3190 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -4388,13 +4388,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(), @@ -4468,13 +4470,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()), @@ -4497,12 +4501,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); } |