summaryrefslogtreecommitdiffstats
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-03-18 14:14:49 -0700
committerKenny Root <kroot@google.com>2010-03-18 14:14:52 -0700
commited9830999aede5e827b31446f91ad90a37b8bba9 (patch)
tree49c40ace21ad5bd9021a243c8bd8abfdbb785f17 /tools/aapt/Resource.cpp
parenta0d6b59d875edb54b1c820fd4573552989c3869b (diff)
downloadframeworks_base-ed9830999aede5e827b31446f91ad90a37b8bba9.zip
frameworks_base-ed9830999aede5e827b31446f91ad90a37b8bba9.tar.gz
frameworks_base-ed9830999aede5e827b31446f91ad90a37b8bba9.tar.bz2
Make aapt warning concise
The previous warning made it seem like it could be using the value specified on the command line, but, in fact, it would ignore the command line value if it were already specified in the AndroidManifest.xml Change-Id: I15e8161e094f17412680d25d3b7b810474eb4a31
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r--tools/aapt/Resource.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 87f2420..a8ac2ec 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -611,7 +611,8 @@ void addTagAttribute(const sp<XMLNode>& node, const char* ns8,
const String16 attr(attr8);
if (node->getAttribute(ns, attr) != NULL) {
- fprintf(stderr, "Warning: AndroidManifest.xml already defines %s (in %s)\n",
+ fprintf(stderr, "Warning: AndroidManifest.xml already defines %s (in %s);"
+ " using existing value in manifest.\n",
String8(attr).string(), String8(ns).string());
return;
}