commit 16647800aaaf6c8a7f8259e97f2200bec2cc0a43
author Stephen Hines <srhines@google.com> Thu Aug 15 16:28:01 2013 -0700
committer Stephen Hines <srhines@google.com> Thu Aug 15 16:36:04 2013 -0700
tree 5fc5047879b73b1766ebf5fa87306252583be1e6
parent 5e37175676a1089fc7c40ac8b705799dccabcc30

Fix RS build.

ANativeWindowBuffer is not available in the NDK, so make it opaque.
This also fixes a broken merge of mine.

Change-Id: I6f07776ec2b6b147edd9e70646d71581d01a93a6

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index cabc1bb..0457595 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -34,7 +34,8 @@
 #include <dlfcn.h>
 #include <unistd.h>
 
-#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
+#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) && \
+        defined(HAVE_ANDROID_OS)
 #include <cutils/properties.h>
 #endif