X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/5af431483a08f10bea3834db1ee7304e735c359c..a34418f35198b41ea041f6df9c40844a73416cad:/Resource.cpp

diff --git a/Resource.cpp b/Resource.cpp
index 87f2420..cafd635 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;
     }
@@ -774,7 +775,7 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
      * allow UTF-8 to be used.
      */
     if (!bundle->getWantUTF16()
-            && bundle->isUTF8Available()) {
+            && bundle->isMinSdkAtLeast(SDK_FROYO)) {
         xmlFlags |= XML_COMPILE_UTF8;
     }