summaryrefslogtreecommitdiffstats
path: root/rsContext.cpp
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-08-14 17:56:38 -0700
committerStephen Hines <srhines@google.com>2013-08-15 00:10:49 -0700
commit6dfe6841d357a1664433f0dcec3c8f4ae8ffbeb0 (patch)
treec0b4320940fe74b3b93084fa645d9696c980dcc4 /rsContext.cpp
parent11418c87254f0cbffa910fe8f105b7da92452487 (diff)
downloadandroid_frameworks_rs-6dfe6841d357a1664433f0dcec3c8f4ae8ffbeb0.tar.gz
android_frameworks_rs-6dfe6841d357a1664433f0dcec3c8f4ae8ffbeb0.tar.bz2
android_frameworks_rs-6dfe6841d357a1664433f0dcec3c8f4ae8ffbeb0.zip
Implement property_get() for the compatibility library.
Bug: 10315692 This change also allows us to remove the dependency on libcutils for the compatibility library. The implementation is the exact version that is in libcutils. Change-Id: If285962d6631cf9ca1030718c436e122f9be1d4f
Diffstat (limited to 'rsContext.cpp')
-rw-r--r--rsContext.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/rsContext.cpp b/rsContext.cpp
index 74c40c5c..dd795a60 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -34,10 +34,14 @@
#include <dlfcn.h>
#include <unistd.h>
-#if !defined(RS_SERVER)
+#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() {