generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am ae1e7545: Merge "Make path to apk compliant with jar url format" into mnc-dev

Browse Source 
* commit 'ae1e75458ad281f121116c8c5dfe9d8086e43a2b':
  Make path to apk compliant with jar url format
This commit is contained in:
Dmitriy Ivanov
2015-06-11 22:43:14 +00:00
committed by Android Git Automerger
parent 05923bacbc ae1e75458a
commit 65126c93a2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linker/linker.cpp
View File

@@ -1122,11 +1122,11 @@ static int open_library_in_zipfile(const char* const path,
off64_t* file_offset) {
TRACE("Trying zip file open from path '%s'", path);
// Treat an '!' character inside a path as the separator between the name
// Treat an '!/' separator inside a path as the separator between the name
// of the zip file on disk and the subdirectory to search within it.
// For example, if path is "foo.zip!bar/bas/x.so", then we search for
// For example, if path is "foo.zip!/bar/bas/x.so", then we search for
// "bar/bas/x.so" within "foo.zip".
const char* separator = strchr(path, '!');
const char* separator = strstr(path, "!/");
if (separator == nullptr) {
return -1;
}
@@ -1140,7 +1140,7 @@ static int open_library_in_zipfile(const char* const path,
buf[separator - path] = '\0';
const char* zip_path = buf;
const char* file_path = &buf[separator - path + 1];
const char* file_path = &buf[separator - path + 2];
int fd = TEMP_FAILURE_RETRY(open(zip_path, O_RDONLY | O_CLOEXEC));
if (fd == -1) {
return -1;