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.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools/aapt2/java/JavaClassGenerator.cpp') diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 6e7c707847b9..b71dc485633b 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -23,6 +23,7 @@ #include #include "android-base/logging.h" +#include "androidfw/StringPiece.h" #include "NameMangler.h" #include "Resource.h" @@ -32,7 +33,8 @@ #include "java/AnnotationProcessor.h" #include "java/ClassDefinition.h" #include "process/SymbolTable.h" -#include "util/StringPiece.h" + +using android::StringPiece; namespace aapt { @@ -58,7 +60,7 @@ static bool IsValidSymbol(const StringPiece& symbol) { * Replace those with '_'. */ static std::string Transform(const StringPiece& symbol) { - std::string output = symbol.ToString(); + std::string output = symbol.to_string(); for (char& c : output) { if (c == '.' || c == '-') { c = '_'; -- cgit v1.2.3