From: Kenny Root <kroot@google.com>
Date: Thu, 18 Mar 2010 21:14:49 +0000 (-0700)
Subject: Make aapt warning concise
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/5265c07843024e4257ac46337ec286cf31b06918

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
---

diff --git a/Resource.cpp b/Resource.cpp
index 87f2420..a8ac2ec 100644
--- a/Resource.cpp
+++ b/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;
     }