Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removes an already defined warning in aapt."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-18 04:40:26 +00:00
committed by Android (Google) Code Review
parent 8ab1a6abc2 75e7d1d73e
commit 0991eb2f49
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/Resource.cpp
View File

@@ -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;
}