Fix VNDK path am: dc42cee700
Change-Id: I41f3bdf45bc7974f7bd3ecc79bc3d47d3199136f
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.");
}
diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index a8f0db6..e9feb1c 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -157,17 +157,14 @@
#ifdef __LP64__
#define SYSLIBPATH "/system/lib64"
-#define SYSLIBPATH_VNDK "/system/lib64/vndk-sp"
#define SYSLIBPATH_BC "/system/lib64"
#define SYSLIBPATH_VENDOR "/system/vendor/lib64"
#elif defined(BUILD_ARM_FOR_X86) && defined(__arm__)
#define SYSLIBPATH "/system/lib/arm"
-#define SYSLIBPATH_VNDK "/system/lib/arm/vndk-sp"
#define SYSLIBPATH_BC "/system/lib"
#define SYSLIBPATH_VENDOR "/system/vendor/lib/arm"
#else
#define SYSLIBPATH "/system/lib"
-#define SYSLIBPATH_VNDK "/system/lib/vndk-sp"
#define SYSLIBPATH_BC "/system/lib"
#define SYSLIBPATH_VENDOR "/system/vendor/lib"
#endif
@@ -197,11 +194,11 @@
inline std::string getVndkSysLibPath() {
char buf[PROP_VALUE_MAX];
android::renderscript::property_get("ro.vndk.version", buf, "");
- std::string versionStr = buf;
- if (versionStr != "" && versionStr != "current") {
- return SYSLIBPATH_VNDK "-" + versionStr;
- }
- return SYSLIBPATH_VNDK;
+ std::string vndk_path = "/apex/com.android.vndk.v" + std::string(buf) + "/lib";
+ #ifdef __LP64__
+ vndk_path += "64";
+ #endif
+ return vndk_path;
}
} // anonymous namespace
