diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-01-19 23:40:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-19 23:40:06 +0000 |
| commit | 1f9f11007db09bbbc156965e77b10de82a32a544 (patch) | |
| tree | e715a9edb691da38726c2c5487625bd35b05ec94 /tools/aapt2/proto/TableProtoSerializer.cpp | |
| parent | 12375e9e0d14868cf63c0d6584c7a7d9440c30c4 (diff) | |
| parent | d5083f6f6b9bc76bbe64052bcec639eee752a321 (diff) | |
Merge "Move StringPiece to libandroidfw"
Diffstat (limited to 'tools/aapt2/proto/TableProtoSerializer.cpp')
| -rw-r--r-- | tools/aapt2/proto/TableProtoSerializer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/proto/TableProtoSerializer.cpp b/tools/aapt2/proto/TableProtoSerializer.cpp index 0d0e46da4ec8..7230b55e10e3 100644 --- a/tools/aapt2/proto/TableProtoSerializer.cpp +++ b/tools/aapt2/proto/TableProtoSerializer.cpp @@ -22,7 +22,7 @@ #include "proto/ProtoSerialize.h" #include "util/BigBuffer.h" -#include <android-base/logging.h> +#include "android-base/logging.h" using google::protobuf::io::CodedOutputStream; using google::protobuf::io::CodedInputStream; @@ -239,7 +239,7 @@ std::unique_ptr<pb::ResourceTable> SerializeTableToPb(ResourceTable* table) { if (type->id) { pb_type->set_id(type->id.value()); } - pb_type->set_name(ToString(type->type).ToString()); + pb_type->set_name(ToString(type->type).to_string()); for (auto& entry : type->entries) { pb::Entry* pb_entry = pb_type->add_entries(); |