merge in honeycomb-release history after reset to honeycomb

[android/aapt.git] / XMLNode.cpp

diff --git a/XMLNode.cpp b/XMLNode.cpp
index cee85469c8481ceabd2d3b98cb49b6852f4fe1aa..8551b0f9c9030c57d00d8dbba6085a0fc9952ac5 100644 (file)
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -203,13 +203,9 @@ status_t parseStyledString(Bundle* bundle,
                 }
             }
             if (xliffDepth == 0 && pseudolocalize) {
-#ifdef ENABLE_PSEUDOLOCALIZE
                 std::string orig(String8(text).string());
                 std::string pseudo = pseudolocalize_string(orig);
                 curString.append(String16(String8(pseudo.c_str())));
-#else
-                assert(false);
-#endif
             } else {
                 if (isFormatted && hasSubstitutionErrors(fileName, inXml, text) != NO_ERROR) {
                     return UNKNOWN_ERROR;