am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread

[android/aapt.git] / Resource.cpp

diff --git a/Resource.cpp b/Resource.cpp
index 87f242047a733e541058884e05bc971675c0d4cb..cafd635c97d34ab6e316ec98665f2ff0baea541e 100644 (file)
--- 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;
     }