summaryrefslogtreecommitdiffstats
path: root/rsDriverLoader.cpp
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-05-07 15:20:05 -0700
committerJason Sams <jsams@google.com>2015-05-07 15:20:05 -0700
commitd97617a0a736b4dadcf978bfc1fa0aef0d4d50d3 (patch)
tree751ea9ffa6fd5d132a51d23b2592a432dfaecee2 /rsDriverLoader.cpp
parent4f8c2b8c519715b05812a1c5b4de0d138ab49dfb (diff)
downloadandroid_frameworks_rs-d97617a0a736b4dadcf978bfc1fa0aef0d4d50d3.tar.gz
android_frameworks_rs-d97617a0a736b4dadcf978bfc1fa0aef0d4d50d3.tar.bz2
android_frameworks_rs-d97617a0a736b4dadcf978bfc1fa0aef0d4d50d3.zip
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. bug 20894664 Change-Id: I0c4a4f12f5db819b234952bc8f364ac6300f147b
Diffstat (limited to 'rsDriverLoader.cpp')
-rw-r--r--rsDriverLoader.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/rsDriverLoader.cpp b/rsDriverLoader.cpp
index 37bd12a2..528af0fa 100644
--- a/rsDriverLoader.cpp
+++ b/rsDriverLoader.cpp
@@ -204,6 +204,9 @@ bool Context::loadRuntime(const char* filename) {
goto error;
}
+ // Only map in the actual driver name if we successfully load the runtime.
+ mDriverName = filename;
+
return true;