Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't explicitly specify no prefix/suffix." into qt-dev-plus-aosp

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-13 03:37:05 +00:00
committed by Android (Google) Code Review
parent 885cc584fc 65c8b86b3f
commit 725cf7ff2b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/aapt2/cmd/Convert_test.cpp
View File

@@ -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
} // namespace aapt