summaryrefslogtreecommitdiff
path: root/cpp/RenderScript.cpp
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-09-10 23:26:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-10 23:26:23 +0000
commitc503150963e76e6d55153b8d45d884750513effb (patch)
tree72889f68d327eaebe92c3d031912822e0ecc7c63 /cpp/RenderScript.cpp
parent5a45c938d8f5e66f0afff7b3a2a9afe06f79c76a (diff)
parentcbbac9f5916b9253d88bc10c3661b1ecaa80afd8 (diff)
am cbbac9f5: Disable property_get for 64-bit.
* commit 'cbbac9f5916b9253d88bc10c3661b1ecaa80afd8': Disable property_get for 64-bit.
Diffstat (limited to 'cpp/RenderScript.cpp')
-rw-r--r--cpp/RenderScript.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp
index 27cb3e83..e2fd651e 100644
--- a/cpp/RenderScript.cpp
+++ b/cpp/RenderScript.cpp
@@ -432,7 +432,7 @@ static bool loadSO(const char* filename) {
}
static uint32_t getProp(const char *str) {
-#if !defined(RS_SERVER) && defined(HAVE_ANDROID_OS)
+#if !defined(__LP64__) && !defined(RS_SERVER) && defined(HAVE_ANDROID_OS)
char buf[256];
property_get(str, buf, "0");
return atoi(buf);