Use versioned VNDK directories
VNDK directories will have "-$VER" as their suffix, where $VER is set
by the property "ro.vndk.version".
For example, if the $VER is "28", the vndk-sp directory is
"system/lib[64]/vndk-sp-28/".
Bug: 69984421
Test: Check if the apps that uses RS works without problem.
Change-Id: I24a9b0ca51f12ab5562a661761401d057d6346a0
diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index bd192ab..a8f0db6 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -194,6 +194,16 @@
}
}
+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;
+}
+
} // anonymous namespace
#endif // RSD_CPU_SCRIPT_H