diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-08 22:25:54 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-08 22:25:54 -0700 |
| commit | 20ec4fa2294a91e5ff87839280904aba4a050cf6 (patch) | |
| tree | 975bff3addce4062cb4227f7d96d1f36a16c7ed0 /tools/aapt/StringPool.cpp | |
| parent | ddb605d4b2fa544bab69a72a288e578f2dd37f52 (diff) | |
| parent | 6c585756b4c66058af85bb8d6524ffa94af79e62 (diff) | |
resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
Diffstat (limited to 'tools/aapt/StringPool.cpp')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 06769e4a6b4d..19ecf697f8ec 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -21,7 +21,7 @@ #define NOISY(x) //x -void strcpy16_htod(uint16_t* dst, const uint16_t* src) +void strcpy16_htod(char16_t* dst, const char16_t* src) { while (*src) { char16_t s = htods(*src); @@ -455,9 +455,9 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool) strncpy((char*)strings, encStr, encSize+1); } else { - uint16_t* strings = (uint16_t*)dat; + char16_t* strings = (char16_t*)dat; - ENCODE_LENGTH(strings, sizeof(uint16_t), strSize) + ENCODE_LENGTH(strings, sizeof(char16_t), strSize) strcpy16_htod(strings, ent.value); } |