diff options
| author | Stephen Hines <srhines@google.com> | 2013-07-10 20:06:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-10 20:06:31 -0700 |
| commit | 5376c9bfa7f4434dde29a31a7437f25708b1b009 (patch) | |
| tree | 235e59c6a8b2e074095cd22ff615a17ed3fbff9f /cpu_ref/rsCpuScript.cpp | |
| parent | f85f4a21f9a5691f6248b41237031325465c5895 (diff) | |
| parent | b0934b67b95cc27e2358c2aa4db5f7c1067c8f9b (diff) | |
am b0934b67: Remove libutils and fix rsDebug for RS support library.
* commit 'b0934b67b95cc27e2358c2aa4db5f7c1067c8f9b':
Remove libutils and fix rsDebug for RS support library.
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index d9e0044c..22e2f0e5 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -19,15 +19,6 @@ #include "rsCpuCore.h" #include "rsCpuScript.h" -//#include "rsdRuntime.h" -//#include "rsdAllocation.h" -//#include "rsCpuIntrinsics.h" - -#ifndef RS_SERVER -#include "utils/Vector.h" -#include "utils/Timers.h" -#include "utils/StopWatch.h" -#endif #ifdef RS_COMPATIBILITY_LIB #include <dlfcn.h> @@ -191,8 +182,7 @@ bool RsdCpuScriptImpl::init(char const *resName, char const *cacheDir, #ifndef RS_SERVER String8 scriptSOName(cacheDir); scriptSOName = scriptSOName.getPathDir(); - scriptSOName.appendPath("lib"); - scriptSOName.append("/librs."); + scriptSOName.append("/lib/librs."); #else String8 scriptSOName("lib"); #endif |