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/Source.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/aapt2/Source.h') diff --git a/tools/aapt2/Source.h b/tools/aapt2/Source.h index 459a8e603b6b..d7f2a668477c 100644 --- a/tools/aapt2/Source.h +++ b/tools/aapt2/Source.h @@ -20,8 +20,9 @@ #include #include +#include "androidfw/StringPiece.h" + #include "util/Maybe.h" -#include "util/StringPiece.h" namespace aapt { @@ -35,12 +36,11 @@ struct Source { Source() = default; - inline Source(const StringPiece& path) - : path(path.ToString()) { // NOLINT(implicit) + inline Source(const android::StringPiece& path) : path(path.to_string()) { // NOLINT(implicit) } - inline Source(const StringPiece& path, size_t line) - : path(path.ToString()), line(line) {} + inline Source(const android::StringPiece& path, size_t line) + : path(path.to_string()), line(line) {} inline Source WithLine(size_t line) const { return Source(path, line); } }; -- cgit v1.2.3-59-g8ed1b