am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev (865acc74) · Commits · e / os / android_frameworks_base

tools/aapt/ResourceTable.cpp

+26 −20

Original line number	Diff line number	Diff line
		@@ -4388,6 +4388,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) {
		continue;
		}

		if (bundle->getVerbose()) {
		entriesToAdd[i].value->getPos()
		.printf("using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.",
		SDK_L,
		@@ -4395,6 +4396,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle) {
		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,6 +4470,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
		resPath.convertToResPath();

		// Add a resource table entry.
		if (bundle->getVerbose()) {
		SourcePos(target->getSourceFile(), -1).printf(
		"using v%d attributes; synthesizing resource %s:%s/%s for configuration %s.",
		SDK_L,
		@@ -4475,6 +4478,7 @@ status_t ResourceTable::modifyForCompat(const Bundle* bundle,
		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];
		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);
		}