Merge "Turn on .so path by default"

1 files changed, 2 insertions, 20 deletions

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index 462c1612..cfb6da26 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -245,26 +245,8 @@ static void *loadSharedLibrary(const char *cacheDir, const char *resName) {
 
 #ifndef RS_COMPATIBILITY_LIB
 
-static bool is_skip_linkloader() {
-    char buf[PROPERTY_VALUE_MAX];
-    static bool initialized = false;
-    static bool prop = false;
-
-    if (initialized) {
-        return prop;
-    }
-
-    property_get("rs.skip.linkloader", buf, "");
-    prop = (buf[0] != '\0');
-    initialized = true;
-
-    if (prop) {
-        ALOGV("Skipping linkloader");
-    }
-    else {
-        ALOGV("Default path: using linkloader");
-    }
-    return prop;
+static inline bool is_skip_linkloader() {
+  return true;
 }
 
 static bool is_force_recompile() {