diff options
| author | Stephen Hines <srhines@google.com> | 2013-07-11 11:45:00 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-07-11 11:45:00 -0700 |
| commit | 140a7acade66ab5d1f3dc55803a3a65a71f3f86c (patch) | |
| tree | b509442693511faf019bb0479669f8422362541f /cpu_ref/rsCpuScript.cpp | |
| parent | 3ad07bf0ccb9064695013d8c61bacaec26a97e6b (diff) | |
| parent | 5376c9bfa7f4434dde29a31a7437f25708b1b009 (diff) | |
resolved conflicts for merge of 5376c9bf to master
Change-Id: I51507da10f8d7116a2aa29446a00a43d397a37c8
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index 6ea0f1c7..a7a639ed 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -17,12 +17,6 @@ #include "rsCpuCore.h" #include "rsCpuScript.h" -#ifndef RS_SERVER -#include "utils/Vector.h" -#include "utils/Timers.h" -#include "utils/StopWatch.h" -#endif - #ifdef RS_COMPATIBILITY_LIB #include <dlfcn.h> #include <stdio.h> @@ -340,8 +334,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 |