diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-08 23:21:07 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-08 23:21:07 +0000 |
| commit | 8848e127c7aa9a7964c06cea0f4429b825e454f1 (patch) | |
| tree | 2c24a26b97bdcf124828c7ab49db8db9854e2a3d /linker/linker.cpp | |
| parent | 30682f8b47ee4c78bfb9aed7a28206e04b78f7d5 (diff) | |
| parent | d13cb58b3afda031fbe38f6dc8eaca28237c8a3b (diff) | |
| download | android_bionic-8848e127c7aa9a7964c06cea0f4429b825e454f1.tar.gz android_bionic-8848e127c7aa9a7964c06cea0f4429b825e454f1.tar.bz2 android_bionic-8848e127c7aa9a7964c06cea0f4429b825e454f1.zip | |
Snap for 5645193 from d13cb58b3afda031fbe38f6dc8eaca28237c8a3b to qt-qpr1-release
Change-Id: I37ff98127f03694e199e8acae723c1f5f1a9e04e
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index b59df7302..324f3ef23 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -1162,6 +1162,13 @@ static int open_library(android_namespace_t* ns, } } +#if !defined(__ANDROID_APEX__) + if (fd == -1) { + std::vector<std::string> bootstrap_paths = { std::string(kSystemLibDir) + "/bootstrap" }; + fd = open_library_on_paths(zip_archive_cache, name, file_offset, bootstrap_paths, realpath); + } +#endif + if (fd == -1) { fd = open_library_on_paths(zip_archive_cache, name, file_offset, ns->get_default_library_paths(), realpath); } |