summaryrefslogtreecommitdiffstats
path: root/third_party/android_crazy_linker
diff options
context:
space:
mode:
authorrmcilroy <rmcilroy@chromium.org>2015-07-02 08:00:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-02 15:01:36 +0000
commit5bdee9ce280c64269fefea901c08f98d90adb232 (patch)
tree8a522b32b5dbe65ddf53916028a28467027dbd34 /third_party/android_crazy_linker
parent8e14bb7c3a81f9d0229238b4e2d320e192646ef0 (diff)
downloadchromium_src-5bdee9ce280c64269fefea901c08f98d90adb232.zip
chromium_src-5bdee9ce280c64269fefea901c08f98d90adb232.tar.gz
chromium_src-5bdee9ce280c64269fefea901c08f98d90adb232.tar.bz2
[android] Remove unpack library fallback.
The load library from APK configuration of Chrome is only going to be used on version of Lollipop onwards where there should be no need to trigger the unpack fallback. UMA shows no use of this fallback in the wild, so let's remove it. BUG=398425, 390618 Review URL: https://codereview.chromium.org/1216703003 Cr-Commit-Position: refs/heads/master@{#337222}
Diffstat (limited to 'third_party/android_crazy_linker')
-rw-r--r--third_party/android_crazy_linker/README.chromium2
-rw-r--r--third_party/android_crazy_linker/src/include/crazy_linker.h14
-rw-r--r--third_party/android_crazy_linker/src/src/crazy_linker_api.cpp25
3 files changed, 0 insertions, 41 deletions
diff --git a/third_party/android_crazy_linker/README.chromium b/third_party/android_crazy_linker/README.chromium
index 9fb91b6..838bb4a 100644
--- a/third_party/android_crazy_linker/README.chromium
+++ b/third_party/android_crazy_linker/README.chromium
@@ -54,8 +54,6 @@ Local Modifications:
- Re-order application of relocation sections to match the system linker.
-- Add method for enabling/disabling the memory fallback (disabled by default).
-
- Add a check whether file is uncompressed in zip file.
- Fix -Wreorder warning (error with -Werror) in class ElfLoader.
diff --git a/third_party/android_crazy_linker/src/include/crazy_linker.h b/third_party/android_crazy_linker/src/include/crazy_linker.h
index a492e6f..1ea8a0a 100644
--- a/third_party/android_crazy_linker/src/include/crazy_linker.h
+++ b/third_party/android_crazy_linker/src/include/crazy_linker.h
@@ -350,20 +350,6 @@ crazy_status_t crazy_library_find_from_address(
void* address,
crazy_library_t** library) _CRAZY_PUBLIC;
-// Return the full path of |lib_name| in the zip file
-// (lib/<abi>/crazy.<lib_name>). The result is returned in
-// |buffer[0..buffer_size - 1]|. If |buffer_size| is too small,
-// CRAZY_STATUS_FAILURE is returned.
-crazy_status_t crazy_library_file_path_in_zip_file(const char* lib_name,
- char* buffer,
- size_t buffer_size)
- _CRAZY_PUBLIC;
-
-// Check whether |lib_name| is page aligned and uncompressed in |zipfile_name|.
-crazy_status_t crazy_linker_check_library_is_mappable_in_zip_file(
- const char* zipfile_name,
- const char* lib_name) _CRAZY_PUBLIC;
-
// Close a library. This decrements its reference count. If it reaches
// zero, the library be unloaded from the process.
void crazy_library_close(crazy_library_t* library) _CRAZY_PUBLIC;
diff --git a/third_party/android_crazy_linker/src/src/crazy_linker_api.cpp b/third_party/android_crazy_linker/src/src/crazy_linker_api.cpp
index 52badb8..31b2a9a 100644
--- a/third_party/android_crazy_linker/src/src/crazy_linker_api.cpp
+++ b/third_party/android_crazy_linker/src/src/crazy_linker_api.cpp
@@ -380,31 +380,6 @@ crazy_status_t crazy_library_find_from_address(void* address,
}
}
-crazy_status_t crazy_library_file_path_in_zip_file(const char* lib_name,
- char* buffer,
- size_t buffer_size) {
- crazy::String path = crazy::LibraryList::GetLibraryFilePathInZipFile(
- lib_name);
- if (path.size() >= buffer_size) {
- return CRAZY_STATUS_FAILURE;
- }
-
- memcpy(buffer, path.c_str(), path.size());
- buffer[path.size()] = '\0';
- return CRAZY_STATUS_SUCCESS;
-}
-
-crazy_status_t crazy_linker_check_library_is_mappable_in_zip_file(
- const char* zipfile_name,
- const char* lib_name) {
- Error error;
- if (crazy::LibraryList::FindMappableLibraryInZipFile(
- zipfile_name, lib_name, &error) == CRAZY_OFFSET_FAILED)
- return CRAZY_STATUS_FAILURE;
-
- return CRAZY_STATUS_SUCCESS;
-}
-
void crazy_library_close(crazy_library_t* library) {
crazy_library_close_with_context(library, NULL);
}