summaryrefslogtreecommitdiff
path: root/cpu_ref/rsCpuScript.cpp
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-03-15 15:56:43 -0700
committerTim Murray <timmurray@google.com>2013-03-19 15:08:44 -0700
commit0b575de8ed0b628d84d256f5846500b0385979bd (patch)
tree255a20e02100f2c53cfaa05b29fb905b38aa6202 /cpu_ref/rsCpuScript.cpp
parent2487bb71ac56dea46ed382739c37f136e67b2062 (diff)
Add x86 server support.
Change-Id: I674acaf15b67afa48bc736f72942a11e2e38e940
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
-rw-r--r--cpu_ref/rsCpuScript.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index 2ae4d83b..78874747 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -23,10 +23,11 @@
//#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>
@@ -177,10 +178,14 @@ bool RsdCpuScriptImpl::init(char const *resName, char const *cacheDir,
#else
+#ifndef RS_SERVER
String8 scriptSOName(cacheDir);
scriptSOName = scriptSOName.getPathDir();
scriptSOName.appendPath("lib");
scriptSOName.append("/librs.");
+#else
+ String8 scriptSOName("lib");
+#endif
scriptSOName.append(resName);
scriptSOName.append(".so");