summaryrefslogtreecommitdiffstats
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-01-20 14:05:35 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-01-20 14:05:35 -0800
commit7547115694ef213f6c4ead3841296370cc07b4af (patch)
tree1c5f7d9b58dc5c0cadf785f3040ef1adc34e8589 /tools/aapt/ResourceTable.cpp
parent0fda766e53fba7e829fe6e145738f6a94ce48bda (diff)
parent22f7dfd23490a3de2f21ff96949ba47003aac8f8 (diff)
downloadframeworks_base-7547115694ef213f6c4ead3841296370cc07b4af.zip
frameworks_base-7547115694ef213f6c4ead3841296370cc07b4af.tar.gz
frameworks_base-7547115694ef213f6c4ead3841296370cc07b4af.tar.bz2
Merge branch 'cupcake'
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
-rw-r--r--tools/aapt/ResourceTable.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 877763d..c438366 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -2165,15 +2165,14 @@ ResourceTable::validateLocalizations(void)
// consider that string to have fulfilled the localization requirement.
String8 region(config.string(), 2);
if (configSet.find(region) == configSet.end()) {
- // TODO: force an error if there is no default to fall back to
if (configSet.count(defaultLocale) == 0) {
- fprintf(stdout, "aapt: warning: "
+ fprintf(stdout, "aapt: error: "
"*** 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;
+ err = UNKNOWN_ERROR;
}
}
}