summaryrefslogtreecommitdiff
path: root/tools/aapt2/proto/ProtoHelpers.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/aapt2/proto/ProtoHelpers.cpp')
-rw-r--r--tools/aapt2/proto/ProtoHelpers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/proto/ProtoHelpers.cpp b/tools/aapt2/proto/ProtoHelpers.cpp
index 99981c52e26f..2aa8aa500387 100644
--- a/tools/aapt2/proto/ProtoHelpers.cpp
+++ b/tools/aapt2/proto/ProtoHelpers.cpp
@@ -33,7 +33,7 @@ void serializeStringPoolToPb(const StringPool& pool, pb::StringPool* outPbPool)
}
void serializeSourceToPb(const Source& source, StringPool* srcPool, pb::Source* outPbSource) {
- StringPool::Ref ref = srcPool->makeRef(util::utf8ToUtf16(source.path));
+ StringPool::Ref ref = srcPool->makeRef(source.path);
outPbSource->set_path_idx(static_cast<uint32_t>(ref.getIndex()));
if (source.line) {
outPbSource->set_line_no(static_cast<uint32_t>(source.line.value()));
@@ -43,7 +43,7 @@ void serializeSourceToPb(const Source& source, StringPool* srcPool, pb::Source*
void deserializeSourceFromPb(const pb::Source& pbSource, const android::ResStringPool& srcPool,
Source* outSource) {
if (pbSource.has_path_idx()) {
- outSource->path = util::getString8(srcPool, pbSource.path_idx()).toString();
+ outSource->path = util::getString(srcPool, pbSource.path_idx());
}
if (pbSource.has_line_no()) {