From d5083f6f6b9bc76bbe64052bcec639eee752a321 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 16 Jan 2017 15:07:21 -0800 Subject: Move StringPiece to libandroidfw libandroidfw needs to make use of StringPiece, so move it to libandroidfw and update all code referencing StringPiece in aapt2. Test: make libandroidfw_tests libaapt2_tests Change-Id: I68d7f0fc7c651b048d9d1f5e7971f10ef5349fa1 --- tools/aapt2/ResourceUtils.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/aapt2/ResourceUtils.cpp') diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index fce9b338d726..11239673272e 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -26,6 +26,9 @@ #include "util/Files.h" #include "util/Util.h" +using android::StringPiece; +using android::StringPiece16; + namespace aapt { namespace ResourceUtils { @@ -59,7 +62,7 @@ Maybe ToResourceName( name_out.entry = util::Utf16ToUtf8(StringPiece16(name_in.name, name_in.nameLen)); } else if (name_in.name8) { - name_out.entry = StringPiece(name_in.name8, name_in.nameLen).ToString(); + name_out.entry.assign(name_in.name8, name_in.nameLen); } else { return {}; } @@ -303,9 +306,7 @@ Maybe ParseXmlAttributeName(const StringPiece& str) { p++; } - ref.name = - ResourceName(package.ToString(), ResourceType::kAttr, - name.empty() ? trimmed_str.ToString() : name.ToString()); + ref.name = ResourceName(package, ResourceType::kAttr, name.empty() ? trimmed_str : name); return Maybe(std::move(ref)); } -- cgit v1.2.3-59-g8ed1b