summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2019-05-10 17:11:36 -0700
committer Elliott Hughes <enh@google.com> 2019-05-11 00:13:09 +0000
commit65c8b86b3f04167d12c6749aeb60ef81c3e8d609 (patch)
tree619beda9b92278e228789acff5f144859b2aafdf
parentf4c92225a6ad81b50a79d0a8c804206ded3ef6cf (diff)
Don't explicitly specify no prefix/suffix.
Bug: http://b/129068177 Test: treehugger Change-Id: Ica29efa3c3e49f556157cb0f82fdadef91aadba8
-rw-r--r--tools/aapt2/cmd/Convert_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/aapt2/cmd/Convert_test.cpp b/tools/aapt2/cmd/Convert_test.cpp
index 3c0fe370c516..ddc146cd27f4 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));
@@ -145,4 +144,4 @@ TEST_F(ConvertTest, DuplicateEntriesWrittenOnce) {
EXPECT_THAT(count, Eq(1));
}
-} // namespace aapt \ No newline at end of file
+} // namespace aapt