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/java/JavaClassGenerator.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'tools/aapt2/java/JavaClassGenerator.h') diff --git a/tools/aapt2/java/JavaClassGenerator.h b/tools/aapt2/java/JavaClassGenerator.h index 190e73b66b9e..5cf556ea5707 100644 --- a/tools/aapt2/java/JavaClassGenerator.h +++ b/tools/aapt2/java/JavaClassGenerator.h @@ -20,10 +20,11 @@ #include #include +#include "androidfw/StringPiece.h" + #include "ResourceTable.h" #include "ResourceValues.h" #include "process/IResourceTableConsumer.h" -#include "util/StringPiece.h" namespace aapt { @@ -69,22 +70,20 @@ class JavaClassGenerator { * We need to generate these symbols in a separate file. * Returns true on success. */ - bool Generate(const StringPiece& packageNameToGenerate, std::ostream* out); + bool Generate(const android::StringPiece& packageNameToGenerate, std::ostream* out); - bool Generate(const StringPiece& packageNameToGenerate, - const StringPiece& outputPackageName, std::ostream* out); + bool Generate(const android::StringPiece& packageNameToGenerate, + const android::StringPiece& outputPackageName, std::ostream* out); const std::string& getError() const; private: - bool AddMembersToTypeClass(const StringPiece& packageNameToGenerate, - const ResourceTablePackage* package, - const ResourceTableType* type, + bool AddMembersToTypeClass(const android::StringPiece& packageNameToGenerate, + const ResourceTablePackage* package, const ResourceTableType* type, ClassDefinition* outTypeClassDef); - void AddMembersToStyleableClass(const StringPiece& packageNameToGenerate, - const std::string& entryName, - const Styleable* styleable, + void AddMembersToStyleableClass(const android::StringPiece& packageNameToGenerate, + const std::string& entryName, const Styleable* styleable, ClassDefinition* outStyleableClassDef); bool SkipSymbol(SymbolState state); -- cgit v1.2.3