diff options
| author | Victor Chang <vichang@google.com> | 2019-02-11 19:35:24 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2019-02-13 15:31:06 +0000 |
| commit | af12c94e79a724e8c9edb07963a97e9b078f3e79 (patch) | |
| tree | b44d52e3977209f1f27ed6b809d228c69ce4385e /linker/linker.cpp | |
| parent | 6cb719f0ed2d59ed88d79e8b36147c49975753c9 (diff) | |
Redirect /system/lib/libicuuc.so regardless of duplication in /system
The change is a workaround of app compat issue until the app fixes the
issue.
Likely, the app does not only dlopen(), but open() the libicuuc.so
with the absolute path.
Note that platform uses the stub libandroidicu.so, not libicuuc directly.
This CL topic moves (not duplicates) libandroidicu from /system to
/apex. Even though /system/lib/libicuuc.so is kept in the default
namespace, but no one should be using it.
Some debug info after this CL:
$ adb shell cat /proc/<zygote pid>/maps | grep libicuuc
$ adb shell cat /proc/<app pid>/maps | grep libicuuc
Only /apex/com.android.runtime/lib64/libicuuc.so is found, not the
/system.
Bug: 124218500
Test: The app can be launched successfully
Test: CtsJniTestCases
Change-Id: I67a50f0ad934be567a63d4038215546c9b4e5f7e
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index e12a28c2b..fafead467 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -2165,9 +2165,13 @@ void* do_dlopen(const char* name, int flags, new_name); // Some APEXs could be optionally disabled. Only translate the path // when the old file is absent and the new file exists. + // TODO(b/124218500): Re-enable it once app compat issue is resolved + /* if (file_exists(name)) { LD_LOG(kLogDlopen, "dlopen %s exists, not translating", name); - } else if (!file_exists(new_name)) { + } else + */ + if (!file_exists(new_name)) { LD_LOG(kLogDlopen, "dlopen %s does not exist, not translating", new_name); } else { |