diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-01-21 23:17:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-21 23:17:37 +0000 |
| commit | 24c1f31c6f03ffffdb08ee2c1c309edbc15b035f (patch) | |
| tree | 6ddfb79547a5a6815b7ec0379e4b9934d7f9b1a2 /cpu_ref/rsCpuScript.cpp | |
| parent | 07f6176b25b056948092bd2edf5d2b2d5dead777 (diff) | |
| parent | f0558cce29611fdba9fdd50d39785f53d95fe1d5 (diff) | |
Merge "Do not check for .so in /system in native mode"
Diffstat (limited to 'cpu_ref/rsCpuScript.cpp')
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index f341b4e0..38a0bf57 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -223,6 +223,7 @@ static void *loadSharedLibrary(const char *cacheDir, const char *resName) { ALOGE("Unable to open shared library (%s): %s", scriptSOName.c_str(), dlerror()); +#ifdef RS_COMPATIBILITY_LIB // One final attempt to find the library in "/system/lib". // We do this to allow bundled applications to use the compatibility // library fallback path. Those applications don't have a private @@ -237,6 +238,7 @@ static void *loadSharedLibrary(const char *cacheDir, const char *resName) { ALOGE("Unable to open system shared library (%s): %s", scriptSONameSystem.c_str(), dlerror()); } +#endif } return loaded; |