commit | 78de4f999dffd9638f5add13240d97fd7b3293ec | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri Jun 14 15:28:38 2019 -0700 |
committer | Elliott Hughes <enh@google.com> | Mon Jun 17 16:47:58 2019 +0000 |
tree | e63f21950490d2639d2aa6532885ce91b95836bd | |
parent | aa4c25ed7500668cb44b9446c04b78a8e214fecb [diff] [blame] |
Move off ZipString and over to std::string/std::string_view as appropriate. Bug: http://b/129068177 Test: treehugger Change-Id: Ib46761d89772d3a3c655a39df573fd305c117d19
diff --git a/tools/aapt2/cmd/Convert_test.cpp b/tools/aapt2/cmd/Convert_test.cpp index ddc146c..f35237e 100644 --- a/tools/aapt2/cmd/Convert_test.cpp +++ b/tools/aapt2/cmd/Convert_test.cpp
@@ -132,7 +132,7 @@ int count = 0; // Can't pass nullptrs into Next() - ZipString zip_name; + std::string zip_name; ZipEntry zip_data; while ((result = Next(cookie, &zip_data, &zip_name)) == 0) {