Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed983099 authored by Kenny Root's avatar Kenny Root
Browse files

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

tools/aapt/Resource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }