diff options
| author | Elliott Hughes <enh@google.com> | 2019-05-06 17:45:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-06 17:45:35 -0700 |
| commit | dfe3d688fc6eae53a2cb750c268c2f37650ab472 (patch) | |
| tree | f3d06229be5badbfc604ae1c2c088e39ffa66449 /libs/androidfw/tests | |
| parent | 816f0fed85d028611380b3516945108e95c29670 (diff) | |
| parent | 78791cd8d7a8015955d0db4bd9c45d337b8c21c2 (diff) | |
Merge "Track libziparchive API change." am: 32581e1dd2
am: 78791cd8d7
Change-Id: Id4ac5019e267fbd0a32a41437e92c3f802e334e8
Diffstat (limited to 'libs/androidfw/tests')
| -rw-r--r-- | libs/androidfw/tests/TestHelpers.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/androidfw/tests/TestHelpers.cpp b/libs/androidfw/tests/TestHelpers.cpp index 9e320a21b534..a81bb6ffab06 100644 --- a/libs/androidfw/tests/TestHelpers.cpp +++ b/libs/androidfw/tests/TestHelpers.cpp @@ -34,9 +34,8 @@ AssertionResult ReadFileFromZipToString(const std::string& zip_path, const std:: << "': " << ::ErrorCodeString(result); } - ::ZipString name(file.c_str()); ::ZipEntry entry; - result = ::FindEntry(handle, name, &entry); + result = ::FindEntry(handle, file.c_str(), &entry); if (result != 0) { ::CloseArchive(handle); return AssertionFailure() << "Could not find file '" << file << "' in zip '" << zip_path |