commit d0f116b619feede0cfdb647157ce5ab4d50a1c46
author Adam Lesinski <adamlesinski@google.com> Fri Jul 08 15:00:32 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Jul 13 17:45:28 2016 -0700
tree 5b2a8663602ba2b267890ff85d3cf5618ac922b5
parent aaac91f4a00a9968ef107ea143e6f2f669f762f1

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/ResourceTable.h

diff --git a/tools/aapt2/ResourceTable.h b/tools/aapt2/ResourceTable.h
index 5690ea6..a5efe35 100644
--- a/tools/aapt2/ResourceTable.h
+++ b/tools/aapt2/ResourceTable.h
@@ -48,7 +48,7 @@
 struct Symbol {
     SymbolState state = SymbolState::kUndefined;
     Source source;
-    std::u16string comment;
+    std::string comment;
 };
 
 class ResourceConfigValue {
@@ -86,7 +86,7 @@
      * this determines the order of this resource
      * when doing lookups.
      */
-    const std::u16string name;
+    const std::string name;
 
     /**
      * The entry ID for this resource.
@@ -103,7 +103,7 @@
      */
     std::vector<std::unique_ptr<ResourceConfigValue>> values;
 
-    ResourceEntry(const StringPiece16& name) : name(name.toString()) { }
+    ResourceEntry(const StringPiece& name) : name(name.toString()) { }
 
     ResourceConfigValue* findValue(const ConfigDescription& config);
     ResourceConfigValue* findValue(const ConfigDescription& config, const StringPiece& product);
@@ -147,8 +147,8 @@
 
     explicit ResourceTableType(const ResourceType type) : type(type) { }
 
-    ResourceEntry* findEntry(const StringPiece16& name);
-    ResourceEntry* findOrCreateEntry(const StringPiece16& name);
+    ResourceEntry* findEntry(const StringPiece& name);
+    ResourceEntry* findOrCreateEntry(const StringPiece& name);
 
 private:
     DISALLOW_COPY_AND_ASSIGN(ResourceTableType);
@@ -165,7 +165,7 @@
 public:
     PackageType type = PackageType::App;
     Maybe<uint8_t> id;
-    std::u16string name;
+    std::string name;
 
     std::vector<std::unique_ptr<ResourceTableType>> types;
 
@@ -209,13 +209,13 @@
     bool addFileReference(const ResourceNameRef& name,
                               const ConfigDescription& config,
                               const Source& source,
-                              const StringPiece16& path,
+                              const StringPiece& path,
                               IDiagnostics* diag);
 
     bool addFileReferenceAllowMangled(const ResourceNameRef& name,
                                       const ConfigDescription& config,
                                       const Source& source,
-                                      const StringPiece16& path,
+                                      const StringPiece& path,
                                       io::IFile* file,
                                       IDiagnostics* diag);
 
@@ -276,21 +276,21 @@
      * exist. The empty string is a valid package and typically is used to represent the
      * 'current' package before it is known to the ResourceTable.
      */
-    ResourceTablePackage* findPackage(const StringPiece16& name);
+    ResourceTablePackage* findPackage(const StringPiece& name);
 
     ResourceTablePackage* findPackageById(uint8_t id);
 
-    ResourceTablePackage* createPackage(const StringPiece16& name, Maybe<uint8_t> id = {});
+    ResourceTablePackage* createPackage(const StringPiece& name, Maybe<uint8_t> id = {});
 
 private:
-    ResourceTablePackage* findOrCreatePackage(const StringPiece16& name);
+    ResourceTablePackage* findOrCreatePackage(const StringPiece& name);
 
     bool addFileReferenceImpl(const ResourceNameRef& name,
                               const ConfigDescription& config,
                               const Source& source,
-                              const StringPiece16& path,
+                              const StringPiece& path,
                               io::IFile* file,
-                              const char16_t* validChars,
+                              const char* validChars,
                               IDiagnostics* diag);
 
     bool addResourceImpl(const ResourceNameRef& name,
@@ -298,14 +298,14 @@
                          const ConfigDescription& config,
                          const StringPiece& product,
                          std::unique_ptr<Value> value,
-                         const char16_t* validChars,
+                         const char* validChars,
                          std::function<int(Value*,Value*)> conflictResolver,
                          IDiagnostics* diag);
 
     bool setSymbolStateImpl(const ResourceNameRef& name,
                             ResourceId resId,
                             const Symbol& symbol,
-                            const char16_t* validChars,
+                            const char* validChars,
                             IDiagnostics* diag);
 
     DISALLOW_COPY_AND_ASSIGN(ResourceTable);