diff options
| author | Stephen Hines <srhines@google.com> | 2013-08-15 15:50:25 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-08-15 15:50:25 -0700 |
| commit | ef7cb5ce9217c08eef64319a223474a8516dacf7 (patch) | |
| tree | eb0a1d03df2f5ea35fb58bda1850515752634570 /rsContext.cpp | |
| parent | fd5136767dee529cfcab02bb766b7d369e20ba58 (diff) | |
| parent | f0b81d23c15f638e4f96510fecf94e3e1a370b4c (diff) | |
| download | rs-ef7cb5ce9217c08eef64319a223474a8516dacf7.tar.gz | |
resolved conflicts for merge of f0b81d23 to klp-dev
Change-Id: I8dbcf6f11bebb97d31c0a95c01c5a3238c1a7f63
Diffstat (limited to 'rsContext.cpp')
| -rw-r--r-- | rsContext.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rsContext.cpp b/rsContext.cpp index 44f2d740..cabc1bb8 100644 --- a/rsContext.cpp +++ b/rsContext.cpp @@ -34,10 +34,14 @@ #include <dlfcn.h> #include <unistd.h> -#if !defined(RS_SERVER) && defined(HAVE_ANDROID_OS) +#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) #include <cutils/properties.h> #endif +#ifdef RS_COMPATIBILITY_LIB +#include "rsCompatibilityLib.h" +#endif + #ifdef RS_SERVER // Android exposes gettid(), standard Linux does not static pid_t gettid() { |