diff options
| author | Miao Wang <miaowang@google.com> | 2017-02-28 21:32:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-28 21:32:00 +0000 |
| commit | 1eb58f06105ebbc9b85583fdc40cab66dd617aa2 (patch) | |
| tree | ed1bc1c706b3e2d17dea384461710ef0b9c4fdd0 /cpu_ref | |
| parent | f919b92fdd60467216415624da39102080253522 (diff) | |
| parent | 392998498505f530c4df1fe235a67f9d19d7ab45 (diff) | |
| download | rs-1eb58f06105ebbc9b85583fdc40cab66dd617aa2.tar.gz | |
Merge "Remove RS_SERVER macros and references to unused headers." am: cb970436a9 am: 36b4ae4166
am: 3929984985
Change-Id: Ie55253f7fc5bee7de97532d616090b86907788e6
Diffstat (limited to 'cpu_ref')
| -rw-r--r-- | cpu_ref/rsCpuCore.cpp | 12 | ||||
| -rw-r--r-- | cpu_ref/rsCpuExecutable.cpp | 5 | ||||
| -rw-r--r-- | cpu_ref/rsCpuRuntimeMath.cpp | 4 | ||||
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 4 |
4 files changed, 0 insertions, 25 deletions
diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp index f0894354..43e45218 100644 --- a/cpu_ref/rsCpuCore.cpp +++ b/cpu_ref/rsCpuCore.cpp @@ -30,18 +30,6 @@ #include <string.h> #include <unistd.h> -#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) -#include <cutils/properties.h> -#include "utils/StopWatch.h" -#endif - -#ifdef RS_SERVER -// Android exposes gettid(), standard Linux does not -static pid_t gettid() { - return syscall(SYS_gettid); -} -#endif - #define REDUCE_ALOGV(mtls, level, ...) do { if ((mtls)->logReduce >= (level)) ALOGV(__VA_ARGS__); } while(0) static pthread_key_t gThreadTLSKey = 0; diff --git a/cpu_ref/rsCpuExecutable.cpp b/cpu_ref/rsCpuExecutable.cpp index 03894d88..84456273 100644 --- a/cpu_ref/rsCpuExecutable.cpp +++ b/cpu_ref/rsCpuExecutable.cpp @@ -59,7 +59,6 @@ static int copyFile(const char *dstFile, const char *srcFile) { static std::string findSharedObjectName(const char *cacheDir, const char *resName) { -#ifndef RS_SERVER std::string scriptSOName(cacheDir); #if defined(RS_COMPATIBILITY_LIB) && !defined(__LP64__) size_t cutPos = scriptSOName.rfind("cache"); @@ -72,10 +71,6 @@ static std::string findSharedObjectName(const char *cacheDir, #else scriptSOName.append("/librs."); #endif // RS_COMPATIBILITY_LIB - -#else - std::string scriptSOName("lib"); -#endif // RS_SERVER scriptSOName.append(resName); scriptSOName.append(".so"); diff --git a/cpu_ref/rsCpuRuntimeMath.cpp b/cpu_ref/rsCpuRuntimeMath.cpp index 6a8f7b64..29ea6580 100644 --- a/cpu_ref/rsCpuRuntimeMath.cpp +++ b/cpu_ref/rsCpuRuntimeMath.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) -#include <cutils/compiler.h> -#endif - #include "rsContext.h" #include "rsScriptC.h" #include "rsMatrix4x4.h" diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index 63be9715..b04e1d28 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -59,9 +59,6 @@ static bool allocationLODIsNull(const android::renderscript::Allocation *alloc) #ifndef RS_COMPATIBILITY_LIB static bool is_force_recompile() { -#ifdef RS_SERVER - return false; -#else char buf[PROPERTY_VALUE_MAX]; // Re-compile if floating point precision has been overridden. @@ -77,7 +74,6 @@ static bool is_force_recompile() { } else { return false; } -#endif // RS_SERVER } static void setCompileArguments(std::vector<const char*>* args, |