diff options
author | Elliott Hughes <enh@google.com> | 2015-08-12 23:47:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-12 23:47:25 +0000 |
commit | 69164f045f62741460fcb4308025fcefa49fe38a (patch) | |
tree | ecae7375478c3ad520664bf34c9259d2fca8b544 | |
parent | 3f93d2a9705df0c4c341ac3e75b3751da82c98c6 (diff) | |
parent | ca6ccd924eaae7c71f620260d62cb17963f69e86 (diff) | |
download | libhardware-69164f045f62741460fcb4308025fcefa49fe38a.tar.gz |
Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."android-m-preview-2
-rw-r--r-- | modules/gralloc/framebuffer.cpp | 2 |
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 |