From d0f116b619feede0cfdb647157ce5ab4d50a1c46 Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Fri, 8 Jul 2016 15:00:32 -0700
Subject: AAPT2: Remove usage of u16string

For legacy reasons, we kept around the use of UTF-16 internally
in AAPT2. We don't need this and this CL removes all instances of
std::u16string and StringPiece16. The only places still needed
are when interacting with the ResTable APIs that only operate in
UTF16.

Change-Id: I492475b84bb9014fa13bf992cff447ee7a5fe588
---
 tools/aapt2/diff/Diff.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools/aapt2/diff/Diff.cpp')

diff --git a/tools/aapt2/diff/Diff.cpp b/tools/aapt2/diff/Diff.cpp
index 1ff6ef6cd2b1..9b1f0572123d 100644
--- a/tools/aapt2/diff/Diff.cpp
+++ b/tools/aapt2/diff/Diff.cpp
@@ -28,7 +28,7 @@ namespace aapt {
 
 class DiffContext : public IAaptContext {
 public:
-    const std::u16string& getCompilationPackage() override {
+    const std::string& getCompilationPackage() override {
         return mEmpty;
     }
 
@@ -57,7 +57,7 @@ public:
     }
 
 private:
-    std::u16string mEmpty;
+    std::string mEmpty;
     StdErrDiagnostics mDiagnostics;
     NameMangler mNameMangler = NameMangler(NameManglerPolicy{});
     SymbolTable mSymbolTable;
-- 
cgit v1.2.3