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/ResourceParser.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/ResourceParser.h') diff --git a/tools/aapt2/ResourceParser.h b/tools/aapt2/ResourceParser.h index 11b1e5b787ca..c12dacf1c707 100644 --- a/tools/aapt2/ResourceParser.h +++ b/tools/aapt2/ResourceParser.h @@ -20,6 +20,7 @@ #include #include "android-base/macros.h" +#include "androidfw/StringPiece.h" #include "ConfigDescription.h" #include "Diagnostics.h" @@ -27,7 +28,6 @@ #include "ResourceValues.h" #include "StringPool.h" #include "util/Maybe.h" -#include "util/StringPiece.h" #include "xml/XmlPullParser.h" namespace aapt { @@ -101,7 +101,7 @@ class ResourceParser { bool ParseAttrImpl(xml::XmlPullParser* parser, ParsedResource* out_resource, bool weak); Maybe ParseEnumOrFlagItem(xml::XmlPullParser* parser, - const StringPiece& tag); + const android::StringPiece& tag); bool ParseStyle(xml::XmlPullParser* parser, ParsedResource* out_resource); bool ParseStyleItem(xml::XmlPullParser* parser, Style* style); bool ParseDeclareStyleable(xml::XmlPullParser* parser, -- cgit v1.2.3-59-g8ed1b