summaryrefslogtreecommitdiff
path: root/cpu_ref/rsCpuScript.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-05-06 00:43:02 -0700
committerStephen Hines <srhines@google.com>2015-05-06 00:47:53 -0700
commit4c368af7e705f0bcb77fa99495b2e33ef20d2699 (patch)
tree6079ee0f2b88a9279dca0948f199477cff37a621 /cpu_ref/rsCpuScript.cpp
parentc8ed6d305d5adc98367bb3acdd5e2188946fb35b (diff)
downloadrs-4c368af7e705f0bcb77fa99495b2e33ef20d2699.tar.gz
Add a way to link against different driver names.
The existing linker path hard-coded "-lRSDriver" into the command line, but this won't work for partner drivers that have a different implementation loaded. In order to still properly handle use of the CPU driver, this needs to change depending on whether we actually loaded an OVERRIDE_RS_DRIVER or not. Change-Id: I0c4a4f12f5db819b234952bc8f364ac6300f147b
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
-rw-r--r--cpu_ref/rsCpuScript.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index 3f64534a..32823747 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -385,7 +385,8 @@ bool RsdCpuScriptImpl::init(char const *resName, char const *cacheDir,
return false;
}
- if (!SharedLibraryUtils::createSharedLibrary(cacheDir, resName)) {
+ if (!SharedLibraryUtils::createSharedLibrary(mCtx->getContext()->getDriverName(),
+ cacheDir, resName)) {
ALOGE("Linker: Failed to link object file '%s'", resName);
mCtx->unlockMutex();
return false;