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/StringPool.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/StringPool.cpp') diff --git a/tools/aapt2/StringPool.cpp b/tools/aapt2/StringPool.cpp index 30328299bb84..d968d73c44ee 100644 --- a/tools/aapt2/StringPool.cpp +++ b/tools/aapt2/StringPool.cpp @@ -22,11 +22,13 @@ #include "android-base/logging.h" #include "androidfw/ResourceTypes.h" +#include "androidfw/StringPiece.h" #include "util/BigBuffer.h" -#include "util/StringPiece.h" #include "util/Util.h" +using android::StringPiece; + namespace aapt { StringPool::Ref::Ref() : entry_(nullptr) {} @@ -140,7 +142,7 @@ StringPool::Ref StringPool::MakeRefImpl(const StringPiece& str, } Entry* entry = new Entry(); - entry->value = str.ToString(); + entry->value = str.to_string(); entry->context = context; entry->index = strings_.size(); entry->ref_ = 0; -- cgit v1.2.3