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)
diff --git a/cpu_ref/rsCpuExecutable.cpp b/cpu_ref/rsCpuExecutable.cpp
index 63008ba..82e3738 100644
--- a/cpu_ref/rsCpuExecutable.cpp
+++ b/cpu_ref/rsCpuExecutable.cpp
@@ -103,7 +103,7 @@
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.");
}