commit d5083f6f6b9bc76bbe64052bcec639eee752a321
author Adam Lesinski <adamlesinski@google.com> Mon Jan 16 15:07:21 2017 -0800
committer Adam Lesinski <adamlesinski@google.com> Tue Jan 17 18:55:51 2017 -0800
tree 29b5dfb74c7e9b12164ced408315b0ad8d5cf527
parent 04e7b6c6de620406348142ba9dd65bad094e264b

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/ClassDefinition.cpp

diff --git a/tools/aapt2/java/ClassDefinition.cpp b/tools/aapt2/java/ClassDefinition.cpp
index f1f1f92..53d6ea1 100644
--- a/tools/aapt2/java/ClassDefinition.cpp
+++ b/tools/aapt2/java/ClassDefinition.cpp
@@ -16,7 +16,9 @@
 
 #include "java/ClassDefinition.h"
 
-#include "util/StringPiece.h"
+#include "androidfw/StringPiece.h"
+
+using android::StringPiece;
 
 namespace aapt {
 
@@ -43,7 +45,7 @@
   }
   *out << "final class " << name_ << " {\n";
 
-  std::string new_prefix = prefix.ToString();
+  std::string new_prefix = prefix.to_string();
   new_prefix.append(kIndent);
 
   for (const std::unique_ptr<ClassMember>& member : members_) {