summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-13 00:40:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-13 00:40:31 +0000
commite830df33e9028e33137b425401e78d00e456aea2 (patch)
tree1573a5e0520c1bc916a4b5b9e5b3333393ed5600
parent3b78a2497fef8d6620c64993eaf075b8c547c8de (diff)
parent69164f045f62741460fcb4308025fcefa49fe38a (diff)
downloadlibhardware-e830df33e9028e33137b425401e78d00e456aea2.tar.gz
am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
* commit '69164f045f62741460fcb4308025fcefa49fe38a': Lose HAVE_ANDROID_OS from hardware/libhardware.
-rw-r--r--modules/gralloc/framebuffer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp
index 486e27ab..eadcdaa6 100644
--- a/modules/gralloc/framebuffer.cpp
+++ b/modules/gralloc/framebuffer.cpp
@@ -33,7 +33,7 @@
#include <cutils/log.h>
#include <cutils/atomic.h>
-#if HAVE_ANDROID_OS
+#ifdef __ANDROID__
#include <linux/fb.h>
#endif