am 66c70e13: Merge change 23529 into eclair

Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp

* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index 95a238401832e78941f045652788cc9950378c80..f9d243423dca99433b4a74f2603d948236014562 100644 (file)
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -2364,13 +2364,12 @@ ResourceTable::validateLocalizations(void)
                         String8 region(config.string(), 2);
                         if (configSet.find(region) == configSet.end()) {
                             if (configSet.count(defaultLocale) == 0) {
-                                fprintf(stdout, "aapt: error: "
+                                fprintf(stdout, "aapt: warning: "
                                         "*** string '%s' has no default or required localization "
                                         "for '%s' in %s\n",
                                         String8(nameIter->first).string(),
                                         config.string(),
                                         mBundle->getResourceSourceDirs()[0]);
-                                err = UNKNOWN_ERROR;
                             }
                         }
                     }

diff --git a/XMLNode.cpp b/XMLNode.cpp
index 6daa0d206da62065111102bf20c68b21d4fb6b17..d4d2a45c2d0f592e1c4ee741575d8dd67a2b673d 100644 (file)
--- a/XMLNode.cpp
+++ b/XMLNode.cpp
@@ -219,7 +219,12 @@ moveon:
             }
             spanStack.pop();
 
-            if (empty) {
+            /*
+             * This warning seems to be just an irritation to most people,
+             * since it is typically introduced by translators who then never
+             * see the warning.
+             */
+            if (0 && empty) {
                 fprintf(stderr, "%s:%d: warning: empty '%s' span found in text '%s'\n",
                         fileName, inXml->getLineNumber(),
                         String8(spanTag).string(), String8(*outString).string());