diff options
| author | Steve Block <steveblock@google.com> | 2010-06-14 17:34:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-06-25 11:02:15 +0100 |
| commit | f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d (patch) | |
| tree | 93b20482d80f3008a887e0c89eaa9a7cd3ad61ca /tools/aapt/XMLNode.cpp | |
| parent | b5c49c8bb1e830ba934c7fbceec9409b89ead4a9 (diff) | |
| download | frameworks_base-f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d.zip frameworks_base-f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d.tar.gz frameworks_base-f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d.tar.bz2 | |
Fixes a few minor problems with AAPT
- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards
This is a first step toward being able to generate APKs on the fly on the device.
Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
Diffstat (limited to 'tools/aapt/XMLNode.cpp')
| -rw-r--r-- | tools/aapt/XMLNode.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp index 57ff47a..452549b 100644 --- a/tools/aapt/XMLNode.cpp +++ b/tools/aapt/XMLNode.cpp @@ -203,9 +203,13 @@ 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; |