| commit | e830df33e9028e33137b425401e78d00e456aea2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 13 00:40:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 00:40:31 2015 +0000 |
| tree | 1573a5e0520c1bc916a4b5b9e5b3333393ed5600 | |
| parent | 3b78a2497fef8d6620c64993eaf075b8c547c8de [diff] | |
| parent | 69164f045f62741460fcb4308025fcefa49fe38a [diff] |
am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware." * commit '69164f045f62741460fcb4308025fcefa49fe38a': Lose HAVE_ANDROID_OS from hardware/libhardware.
diff --git a/modules/gralloc/framebuffer.cpp b/modules/gralloc/framebuffer.cpp index 486e27a..eadcdaa 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