1 files changed, 4 insertions, 4 deletions
diff --git a/tools/aapt2/test/Common.h b/tools/aapt2/test/Common.h
index faccd47783ff..b2eaba6439d8 100644
--- a/tools/aapt2/test/Common.h
+++ b/tools/aapt2/test/Common.h
@@ -62,7 +62,7 @@ inline IDiagnostics* getDiagnostics() {
     return &diag;
 }
 
-inline ResourceName parseNameOrDie(const StringPiece16& str) {
+inline ResourceName parseNameOrDie(const StringPiece& str) {
     ResourceNameRef ref;
     bool result = ResourceUtils::tryParseReference(str, &ref);
     assert(result && "invalid resource name");
@@ -77,7 +77,7 @@ inline ConfigDescription parseConfigOrDie(const StringPiece& str) {
 }
 
 template <typename T> T* getValueForConfigAndProduct(ResourceTable* table,
-                                                     const StringPiece16& resName,
+                                                     const StringPiece& resName,
                                                      const ConfigDescription& config,
                                                      const StringPiece& product) {
     Maybe<ResourceTable::SearchResult> result = table->findResource(parseNameOrDie(resName));
@@ -90,12 +90,12 @@ template <typename T> T* getValueForConfigAndProduct(ResourceTable* table,
     return nullptr;
 }
 
-template <typename T> T* getValueForConfig(ResourceTable* table, const StringPiece16& resName,
+template <typename T> T* getValueForConfig(ResourceTable* table, const StringPiece& resName,
                                            const ConfigDescription& config) {
     return getValueForConfigAndProduct<T>(table, resName, config, {});
 }
 
-template <typename T> T* getValue(ResourceTable* table, const StringPiece16& resName) {
+template <typename T> T* getValue(ResourceTable* table, const StringPiece& resName) {
     return getValueForConfig<T>(table, resName, {});
 }