diff options
Diffstat (limited to 'tools/aapt2/cmd/Convert_test.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Convert_test.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/aapt2/cmd/Convert_test.cpp b/tools/aapt2/cmd/Convert_test.cpp index 3c0fe370c516..f35237ec25e3 100644 --- a/tools/aapt2/cmd/Convert_test.cpp +++ b/tools/aapt2/cmd/Convert_test.cpp @@ -123,8 +123,7 @@ TEST_F(ConvertTest, DuplicateEntriesWrittenOnce) { void* cookie = nullptr; - ZipString prefix("res/theme/10"); - int32_t result = StartIteration(handle, &cookie, &prefix, nullptr); + int32_t result = StartIteration(handle, &cookie, "res/theme/10", ""); // If this is -5, that means we've found a duplicate entry and this test has failed EXPECT_THAT(result, Eq(0)); @@ -133,7 +132,7 @@ TEST_F(ConvertTest, DuplicateEntriesWrittenOnce) { 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) { @@ -145,4 +144,4 @@ TEST_F(ConvertTest, DuplicateEntriesWrittenOnce) { EXPECT_THAT(count, Eq(1)); } -} // namespace aapt
\ No newline at end of file +} // namespace aapt |