diff options
| author | Stephen Hines <srhines@google.com> | 2013-07-03 17:27:38 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-07-10 18:29:06 -0700 |
| commit | b0934b67b95cc27e2358c2aa4db5f7c1067c8f9b (patch) | |
| tree | 235e59c6a8b2e074095cd22ff615a17ed3fbff9f /cpu_ref/rsCpuScript.cpp | |
| parent | 606e50048307530335b0885364ba888da436229b (diff) | |
Remove libutils and fix rsDebug for RS support library.
Bug: 9664050
Our bitcode runtime library translates vector rsDebug() calls into passing
their parameters via pointers. The previous version of libRSSupport.so was
being created with non-pointer versions of these routines accidentally.
This change also fixes a missing permission issue for ImageProcessing2, so
that the compatibility library can be verified.
This change also removes the use of libutils by switching the implementation of
String8/Vector in the compatibility library to internal types backed by
libstlport_static.
Change-Id: I20da75e8c19a82a42dc2bceaba1937d21372db84
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 |