Format aapt warnings the same way as other compiler warnings (dd931864) · Commits · e / os / android_frameworks_base

tools/aapt/Package.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ status_t writeAPK(Bundle* bundle, const sp<AaptAssets>& assets,
		delete zip; // close the file so we can remove it in Win32
		zip = NULL;
		if (unlink(outputFile.string()) != 0) {
		fprintf(stderr, "WARNING: could not unlink '%s'\n", outputFile.string());
		fprintf(stderr, "warning: could not unlink '%s'\n", outputFile.string());
		}
		}

		@@ -181,7 +181,7 @@ bail:
		printf("Removing %s due to earlier failures\n", outputFile.string());
		}
		if (unlink(outputFile.string()) != 0) {
		fprintf(stderr, "WARNING: could not unlink '%s'\n", outputFile.string());
		fprintf(stderr, "warning: could not unlink '%s'\n", outputFile.string());
		}
		}

		@@ -283,7 +283,7 @@ bool processFile(Bundle* bundle, ZipFile* zip,
		if (fileNameLen > excludeExtensionLen
		&& (0 == strcmp(storageName.string() + (fileNameLen - excludeExtensionLen),
		kExcludeExtension))) {
		fprintf(stderr, "WARNING: '%s' not added to Zip\n", storageName.string());
		fprintf(stderr, "warning: '%s' not added to Zip\n", storageName.string());
		return true;
		}

tools/aapt/Resource.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ static sp<AaptFile> getResourceFile(const sp<AaptAssets>& assets, bool makeIfNec
		static status_t parsePackage(const sp<AaptAssets>& assets, const sp<AaptGroup>& grp)
		{
		if (grp->getFiles().size() != 1) {
		fprintf(stderr, "WARNING: Multiple AndroidManifest.xml files found, using %s\n",
		fprintf(stderr, "warning: Multiple AndroidManifest.xml files found, using %s\n",
		grp->getFiles().valueAt(0)->getPrintableSource().string());
		}

		@@ -419,7 +419,7 @@ static void checkForIds(const String8& path, ResXMLParser& parser)
		if (code == ResXMLTree::START_TAG) {
		ssize_t index = parser.indexOfAttribute(NULL, "id");
		if (index >= 0) {
		fprintf(stderr, "%s:%d: WARNING: found plain 'id' attribute; did you mean the new 'android:id' name?\n",
		fprintf(stderr, "%s:%d: warning: found plain 'id' attribute; did you mean the new 'android:id' name?\n",
		path.string(), parser.getLineNumber());
		}
		}

tools/aapt/ResourceTable.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -3554,26 +3554,26 @@ sp<const ResourceTable::Entry> ResourceTable::getEntry(uint32_t resID,

		}
		if (p == NULL) {
		fprintf(stderr, "WARNING: Package not found for resource #%08x\n", resID);
		fprintf(stderr, "warning: Package not found for resource #%08x\n", resID);
		return NULL;
		}

		int tid = Res_GETTYPE(resID);
		if (tid < 0 \|\| tid >= (int)p->getOrderedTypes().size()) {
		fprintf(stderr, "WARNING: Type not found for resource #%08x\n", resID);
		fprintf(stderr, "warning: Type not found for resource #%08x\n", resID);
		return NULL;
		}
		sp<Type> t = p->getOrderedTypes()[tid];

		int eid = Res_GETENTRY(resID);
		if (eid < 0 \|\| eid >= (int)t->getOrderedConfigs().size()) {
		fprintf(stderr, "WARNING: Entry not found for resource #%08x\n", resID);
		fprintf(stderr, "warning: Entry not found for resource #%08x\n", resID);
		return NULL;
		}

		sp<ConfigList> c = t->getOrderedConfigs()[eid];
		if (c == NULL) {
		fprintf(stderr, "WARNING: Entry not found for resource #%08x\n", resID);
		fprintf(stderr, "warning: Entry not found for resource #%08x\n", resID);
		return NULL;
		}

		@@ -3581,7 +3581,7 @@ sp<const ResourceTable::Entry> ResourceTable::getEntry(uint32_t resID,
		if (config) cdesc = *config;
		sp<Entry> e = c->getEntries().valueFor(cdesc);
		if (c == NULL) {
		fprintf(stderr, "WARNING: Entry configuration not found for resource #%08x\n", resID);
		fprintf(stderr, "warning: Entry configuration not found for resource #%08x\n", resID);
		return NULL;
		}

		@@ -3599,7 +3599,7 @@ const ResourceTable::Item* ResourceTable::getItem(uint32_t resID, uint32_t attrI
		for (size_t i=0; i<N; i++) {
		const Item& it = e->getBag().valueAt(i);
		if (it.bagKeyId == 0) {
		fprintf(stderr, "WARNING: ID not yet assigned to '%s' in bag '%s'\n",
		fprintf(stderr, "warning: ID not yet assigned to '%s' in bag '%s'\n",
		String8(e->getName()).string(),
		String8(e->getBag().keyAt(i)).string());
		}
		@@ -3627,7 +3627,7 @@ bool ResourceTable::getItemValue(
		break;
		}
		}
		fprintf(stderr, "WARNING: Circular reference detected in key '%s' of bag '%s'\n",
		fprintf(stderr, "warning: Circular reference detected in key '%s' of bag '%s'\n",
		String8(e->getName()).string(),
		String8(e->getBag().keyAt(i)).string());
		return false;

tools/aapt/SourcePos.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ ErrorPos::operator=(const ErrorPos& rhs)
		void
		ErrorPos::print(FILE* to) const
		{
		const char* type = fatal ? "ERROR" : "WARNING";
		const char* type = fatal ? "error:" : "warning:";

		if (this->line >= 0) {
		fprintf(to, "%s:%d: %s %s\n", this->file.string(), this->line, type, this->error.string());

tools/aapt/XMLNode.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ moveon:
		spanStack.pop();

		if (empty) {
		fprintf(stderr, "%s:%d: WARNING: empty '%s' span found in text '%s'\n",
		fprintf(stderr, "%s:%d: warning: empty '%s' span found in text '%s'\n",
		fileName, inXml->getLineNumber(),
		String8(spanTag).string(), String8(*outString).string());