tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Track libziparchive API change.

Browse source 
Bug: http://b/129068177
Test: treehugger
Change-Id: Ieccd528a34b66de59fad78586dead6b1df9cae98
This commit is contained in:
Elliott Hughes 2019-05-03 22:45:41 -07:00
parent 2c02e45f4b
commit b51bb50471
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linker/linker.cpp
View file

@ -1039,7 +1039,7 @@ static int open_library_in_zipfile(ZipArchiveCache* zip_archive_cache,
ZipEntry entry;
if (FindEntry(handle, ZipString(file_path), &entry) != 0) {
if (FindEntry(handle, file_path, &entry) != 0) {
// Entry was not found.
close(fd);
return -1;

5
tests/dlext_test.cpp
View file

@ -134,10 +134,7 @@ TEST_F(DlExtTest, ExtInfoUseFdWithOffset) {
ZipArchiveHandle handle;
ASSERT_EQ(0, OpenArchive(lib_path.c_str(), &handle));
ZipEntry zip_entry;
ZipString zip_name;
zip_name.name = reinterpret_cast<const uint8_t*>(kLibZipSimpleZip);
zip_name.name_length = strlen(kLibZipSimpleZip);
ASSERT_EQ(0, FindEntry(handle, zip_name, &zip_entry));
ASSERT_EQ(0, FindEntry(handle, kLibZipSimpleZip, &zip_entry));
extinfo.library_fd_offset = zip_entry.offset;
CloseArchive(handle);