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 a8ac2eca99a22a08a0d168e828851c6c84cb0fbb..cafd635c97d34ab6e316ec98665f2ff0baea541e 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -775,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;
     }