Library loading fallback.

third_party/android_crazy_linker/src/src/crazy_linker_library_list.cpp

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.

[rmcilroy, 2014/10/29 17:20:44]

filepath

[petrcermak, 2014/10/30 19:55:07]

Done (changed to "path"). Also changed the name of the constant to
kMaxFilePathLengthInZip.

 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) {

[rmcilroy, 2014/10/29 17:20:44]

GetLibraryFilePathInZipFile

[petrcermak, 2014/10/30 19:55:07]

Done.

   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) {

[picksi1, 2014/10/30 10:48:08]

Should '+1 >' be replaced with '>=' instead? I have a general unease throughout
this file with the +1s and size()s!

should error be called error_reporting (or something) as 'if (error)' is a bit
misleading.

[petrcermak, 2014/10/30 19:55:07]

Again, this if statement was removed in my previous CL
(https://codereview.chromium.org/684453003/). I also changed it to ">=" as you
suggested.

       error->Format("Filename too long for a file in a zip file %s\n",