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/ConfigDescription.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/aapt2/ConfigDescription.h') diff --git a/tools/aapt2/ConfigDescription.h b/tools/aapt2/ConfigDescription.h index 97d0f38a5af1..65c96175091c 100644 --- a/tools/aapt2/ConfigDescription.h +++ b/tools/aapt2/ConfigDescription.h @@ -20,8 +20,7 @@ #include #include "androidfw/ResourceTypes.h" - -#include "util/StringPiece.h" +#include "androidfw/StringPiece.h" namespace aapt { @@ -42,7 +41,7 @@ struct ConfigDescription : public android::ResTable_config { * The resulting configuration has the appropriate sdkVersion defined * for backwards compatibility. */ - static bool Parse(const StringPiece& str, ConfigDescription* out = nullptr); + static bool Parse(const android::StringPiece& str, ConfigDescription* out = nullptr); /** * If the configuration uses an axis that was added after -- cgit v1.2.3-59-g8ed1b