diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-09 15:02:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 15:02:57 +0000 |
| commit | 181f731f9d3692906a1a85d4b077633e4c4d0bb5 (patch) | |
| tree | 32946c07c34e3a7143cba31e8500ffa6b1ecfeec /tools/aapt/StringPool.cpp | |
| parent | 95babac7f58b552633ca511ece0b47adaf8a19c3 (diff) | |
| parent | bb4ed4947c5945c0d9b3a780c0ea30759c916d7f (diff) | |
| download | frameworks_base-181f731f9d3692906a1a85d4b077633e4c4d0bb5.zip frameworks_base-181f731f9d3692906a1a85d4b077633e4c4d0bb5.tar.gz frameworks_base-181f731f9d3692906a1a85d4b077633e4c4d0bb5.tar.bz2 | |
am 167efbdf: Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
* commit '167efbdfcf22143c7383091ba46d59bea9921e0d':
Use char16_t for char things.
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 06769e4..19ecf69 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); } |