diff options
Diffstat (limited to 'tools/aapt2/util/Util.cpp')
| -rw-r--r-- | tools/aapt2/util/Util.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp index d5c0c8a7a5fe..cf2232254ec4 100644 --- a/tools/aapt2/util/Util.cpp +++ b/tools/aapt2/util/Util.cpp @@ -15,9 +15,6 @@ */ #include "util/Util.h" -#include "util/BigBuffer.h" -#include "util/Maybe.h" -#include "util/StringPiece.h" #include <utils/Unicode.h> #include <algorithm> @@ -25,6 +22,14 @@ #include <string> #include <vector> +#include "androidfw/StringPiece.h" + +#include "util/BigBuffer.h" +#include "util/Maybe.h" + +using android::StringPiece; +using android::StringPiece16; + namespace aapt { namespace util { @@ -36,7 +41,7 @@ static std::vector<std::string> SplitAndTransform( StringPiece::const_iterator current; do { current = std::find(start, end, sep); - parts.emplace_back(str.substr(start, current).ToString()); + parts.emplace_back(str.substr(start, current).to_string()); if (f) { std::string& part = parts.back(); std::transform(part.begin(), part.end(), part.begin(), f); @@ -162,7 +167,7 @@ Maybe<std::string> GetFullyQualifiedClassName(const StringPiece& package, } if (util::IsJavaClassName(classname)) { - return classname.ToString(); + return classname.to_string(); } if (package.empty()) { |