diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-12 23:47:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-12 23:47:09 +0000 |
| commit | 7cb35689b34d433744254ba6ebda9909d3154664 (patch) | |
| tree | 3c6443d870132c374140cb6f0686f2a752d2e2c3 | |
| parent | 60d8ff5ef142858d6df3cef24ab7f1e6b682a9fb (diff) | |
| parent | 4710b05b4762c21b8d5e7ea5050aa31998cfeb12 (diff) | |
| download | exynos5-master.tar.gz | |
Merge "Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5."HEADandroid-m-preview-2mastermain
| -rw-r--r-- | gralloc/framebuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gralloc/framebuffer.cpp b/gralloc/framebuffer.cpp index 82a36bc..86db030 100644 --- a/gralloc/framebuffer.cpp +++ b/gralloc/framebuffer.cpp @@ -35,7 +35,7 @@ #include <cutils/log.h> #include <cutils/atomic.h> -#if HAVE_ANDROID_OS +#ifdef __ANDROID__ #include <linux/fb.h> #endif |