diff options
author | Victor Khimenko <khim@google.com> | 2020-06-01 17:56:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 17:56:12 +0000 |
commit | 6e5bc2304f2600e6be5add7c91ebca6192e77c03 (patch) | |
tree | 10be4a9d63a1da8cf4edcfbf9dcfc3f1718fd2f8 | |
parent | 0a050b19596a04133a3766feabe4b6f3e2b2c716 (diff) | |
parent | ccf160244c33102c84b412c54f82259eb0e13ad3 (diff) | |
download | bionic-6e5bc2304f2600e6be5add7c91ebca6192e77c03.tar.gz |
Allow native_bridge linker to use different APEX from native one am: ccf160244c
Change-Id: I942942bddddc51b15964be8e9b8c7bbd907ad32b
-rw-r--r-- | linker/linker.cpp | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 15b6a40ff..f24167722 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -65,6 +65,7 @@ #include "linker_phdr.h" #include "linker_relocate.h" #include "linker_tls.h" +#include "linker_translate_path.h" #include "linker_utils.h" #include "private/bionic_call_ifunc_resolver.h" @@ -103,7 +104,6 @@ static const char* const kVendorLibDir = "/vendor/lib64"; static const char* const kAsanSystemLibDir = "/data/asan/system/lib64"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib64"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib64"; -static const char* const kArtApexLibDir = "/apex/com.android.art/lib64"; #else static const char* const kSystemLibDir = "/system/lib"; static const char* const kOdmLibDir = "/odm/lib"; @@ -111,7 +111,6 @@ static const char* const kVendorLibDir = "/vendor/lib"; static const char* const kAsanSystemLibDir = "/data/asan/system/lib"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib"; -static const char* const kArtApexLibDir = "/apex/com.android.art/lib"; #endif static const char* const kAsanLibDirPrefix = "/data/asan"; @@ -235,44 +234,6 @@ static bool is_greylisted(android_namespace_t* ns, const char* name, const soinf } // END OF WORKAROUND -// Workaround for dlopen(/system/lib(64)/<soname>) when .so is in /apex. http://b/121248172 -/** - * Translate /system path to /apex path if needed - * The workaround should work only when targetSdkVersion < Q. - * - * param out_name_to_apex pointing to /apex path - * return true if translation is needed - */ -static bool translateSystemPathToApexPath(const char* name, std::string* out_name_to_apex) { - static const char* const kSystemToArtApexLibs[] = { - "libicuuc.so", - "libicui18n.so", - }; - // New mapping for new apex should be added below - - // Nothing to do if target sdk version is Q or above - if (get_application_target_sdk_version() >= 29) { - return false; - } - - // If the path isn't /system/lib, there's nothing to do. - if (name == nullptr || dirname(name) != kSystemLibDir) { - return false; - } - - const char* base_name = basename(name); - - for (const char* soname : kSystemToArtApexLibs) { - if (strcmp(base_name, soname) == 0) { - *out_name_to_apex = std::string(kArtApexLibDir) + "/" + base_name; - return true; - } - } - - return false; -} -// End Workaround for dlopen(/system/lib/<soname>) when .so is in /apex. - static std::vector<std::string> g_ld_preload_names; static void notify_gdb_of_load(soinfo* info) { |