diff options
| author | Jooyung Han <jooyung@google.com> | 2020-03-25 21:46:54 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2020-04-10 01:41:11 +0900 |
| commit | 5b809071c51d82115169ec15aa03c8cc9d4f2155 (patch) | |
| tree | a5d8a9e4c9157b51133dacddcf025899e8b8e959 /cpu_ref/rsCpuExecutable.cpp | |
| parent | 1bf3901e2b260df612cdff03532c8d46a1d08cc8 (diff) | |
| download | rs-5b809071c51d82115169ec15aa03c8cc9d4f2155.tar.gz | |
Fix VNDK path
Previously, isRunningInVndkNamespace returns true if the shared object
is loaded from the path including "/vndk-sp".
This change fixes it to use a new VNDK path.
And also getVndkSysLibPath() is amended as well.
Bug: 151635128
Test: build
Merged-In: Ic2d5040a14b960562ffcba0d5589d120bd27c6aa
Change-Id: Ic2d5040a14b960562ffcba0d5589d120bd27c6aa
(cherry picked from commit dc42cee700bf2ae1b9fb789455ea5110b30f69ad)
Diffstat (limited to 'cpu_ref/rsCpuExecutable.cpp')
| -rw-r--r-- | cpu_ref/rsCpuExecutable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu_ref/rsCpuExecutable.cpp b/cpu_ref/rsCpuExecutable.cpp index 63008ba1..82e3738f 100644 --- a/cpu_ref/rsCpuExecutable.cpp +++ b/cpu_ref/rsCpuExecutable.cpp @@ -103,7 +103,7 @@ static bool isRunningInVndkNamespace() { Dl_info info; if (dladdr(reinterpret_cast<const void*>(&isRunningInVndkNamespace), &info) != 0) { std::string filename = std::string(info.dli_fname); - return filename.find("/vndk-sp") != std::string::npos; + return filename.find("/apex/com.android.vndk") != std::string::npos; } else { ALOGW("Can't determine whether this lib is running in vndk namespace or not. Assuming it is in vndk namespace."); } |