| commit | cae0a4c1133556d70a5e1cd89955570334e5643d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 12 14:36:16 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Aug 12 14:36:16 2015 -0700 |
| tree | fe901af718c8902f84f9a0122457db0d744e74e3 | |
| parent | c3f3bf94df8616e2883c1beacb6fa06bc8b12a50 [diff] |
Lose HAVE_ANDROID_OS in device/moto/shamu. Change-Id: I8aa0e41171daab02565fc15ed1ec6425479c14ad
diff --git a/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp b/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp index 37b0e07..931a33a 100644 --- a/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp +++ b/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp
@@ -33,7 +33,7 @@ #include <fcntl.h> #include <cutils/properties.h> #include <math.h> -#if HAVE_ANDROID_OS +#if __ANDROID__ #include <linux/android_pmem.h> #endif #include <linux/ioctl.h>
diff --git a/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp b/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp index c37e341..554db3c 100644 --- a/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp +++ b/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp
@@ -31,7 +31,7 @@ #include <fcntl.h> #include <cutils/properties.h> #include <math.h> -#if HAVE_ANDROID_OS +#if __ANDROID__ #include <linux/android_pmem.h> #endif #include <linux/ioctl.h>
diff --git a/camera/QCamera/HAL/usbcamcore/src/QCameraUsbParm.cpp b/camera/QCamera/HAL/usbcamcore/src/QCameraUsbParm.cpp index fda6e9d..f4465ae 100644 --- a/camera/QCamera/HAL/usbcamcore/src/QCameraUsbParm.cpp +++ b/camera/QCamera/HAL/usbcamcore/src/QCameraUsbParm.cpp
@@ -40,7 +40,7 @@ #include <fcntl.h> #include <cutils/properties.h> #include <math.h> -#if HAVE_ANDROID_OS +#if __ANDROID__ #include <linux/android_pmem.h> #endif #include <linux/ioctl.h>