Merge "Removes an already defined warning in aapt." (0991eb2f) · Commits · e / os / android_frameworks_base

tools/aapt/Resource.cpp

+0 −9

Original line number	Diff line number	Diff line
		@@ -721,11 +721,6 @@ bool addTagAttribute(const sp<XMLNode>& node, const char* ns8,
		XMLNode::attribute_entry* existingEntry = node->editAttribute(ns, attr);
		if (existingEntry != NULL) {
		if (replaceExisting) {
		if (kIsDebug) {
		printf("Info: AndroidManifest.xml already defines %s (in %s);"
		" overwriting existing value from manifest.\n",
		String8(attr).string(), String8(ns).string());
		}
		existingEntry->string = String16(value);
		return true;
		}
		@@ -737,10 +732,6 @@ bool addTagAttribute(const sp<XMLNode>& node, const char* ns8,
		return false;
		}

		fprintf(stderr, "Warning: AndroidManifest.xml already defines %s (in %s);"
		" using existing value in manifest.\n",
		String8(attr).string(), String8(ns).string());

		// don't stop the build.
		return true;
		}