Remove RS_SERVER macros and references to unused headers.

 - The RS_SERVER macros were intended to have a version of RenderScript
 running on the desktop.  It has not fully worked for a very long time.

Bug: 35473587
Test: build and CTS tests pass
Change-Id: I0da3fc9d4601951442384d05f9dbecaeddeff8cc

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,