Index: third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp |
diff --git a/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp b/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp |
index 5804278f48b8d496c2f57d098416395b71a882c1..045eea57dfdee3452695383d04843b7fb506bb2e 100644 |
--- a/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp |
+++ b/third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp |
@@ -20,7 +20,7 @@ namespace crazy { |
namespace { |
-// Maximum name length of a file in a zip file. |
+// Maximum filename length of a file in a zip file. |
const size_t kMaxFilenameInZip = 256; |
// Page size. |
@@ -399,17 +399,21 @@ LibraryView* LibraryList::LoadLibrary(const char* lib_name, |
#error "Unsupported target abi" |
#endif |
-int LibraryList::FindAlignedLibraryInZipFile( |
- const char* zip_file_path, |
- const char* lib_name, |
- Error* error) { |
+String LibraryList::GetLibraryFilenameInZipFile(const char* lib_name) { |
String fullname; |
fullname.Reserve(kMaxFilenameInZip); |
fullname = "lib/"; |
fullname += CURRENT_ABI; |
fullname += "/crazy."; |
fullname += lib_name; |
+ return fullname; |
+} |
+int LibraryList::FindAlignedLibraryInZipFile( |
+ const char* zip_file_path, |
+ const char* lib_name, |
+ Error* error) { |
+ String fullname = GetLibraryFilenameInZipFile(lib_name); |
if (fullname.size() + 1 > kMaxFilenameInZip) { |
if (error) { |
error->Format("Filename too long for a file in a zip file %s\n", |