diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 12:48:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 12:48:44 +0000 |
| commit | 6867db29809c352477531cd7c439316d33ed5465 (patch) | |
| tree | bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320 | |
| parent | 11e5ff75af866f91622b6008fa13db1c3685ae69 (diff) | |
| parent | 93554468123313a9585281d6c7e2509854ae1142 (diff) | |
| download | invensense-6867db29809c352477531cd7c439316d33ed5465.tar.gz | |
Merge "Don't use cutils/Atomic.h"
am: 9355446812
Change-Id: I4dc657debfdbaeecde2d1e5c130af9bcbafc0322
| -rw-r--r-- | 6515/libsensors_iio/MPLSensor.cpp | 2 | ||||
| -rwxr-xr-x | 6515/libsensors_iio/sensors_mpl.cpp | 2 | ||||
| -rw-r--r-- | 65xx/libsensors_iio/MPLSensor.cpp | 2 | ||||
| -rw-r--r-- | 65xx/libsensors_iio/sensors_mpl.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/6515/libsensors_iio/MPLSensor.cpp b/6515/libsensors_iio/MPLSensor.cpp index 67cc010..acae228 100644 --- a/6515/libsensors_iio/MPLSensor.cpp +++ b/6515/libsensors_iio/MPLSensor.cpp @@ -30,13 +30,13 @@ #include <sys/syscall.h> #include <dlfcn.h> #include <pthread.h> +#include <cutils/atomic.h> #include <cutils/log.h> #include <utils/KeyedVector.h> #include <utils/Vector.h> #include <utils/String8.h> #include <string.h> #include <linux/input.h> -#include <utils/Atomic.h> #include <utils/SystemClock.h> #include "MPLSensor.h" diff --git a/6515/libsensors_iio/sensors_mpl.cpp b/6515/libsensors_iio/sensors_mpl.cpp index 3f1b67a..9af10f4 100755 --- a/6515/libsensors_iio/sensors_mpl.cpp +++ b/6515/libsensors_iio/sensors_mpl.cpp @@ -30,7 +30,7 @@ #include <linux/input.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/SystemClock.h> diff --git a/65xx/libsensors_iio/MPLSensor.cpp b/65xx/libsensors_iio/MPLSensor.cpp index d63c0ae..1f42650 100644 --- a/65xx/libsensors_iio/MPLSensor.cpp +++ b/65xx/libsensors_iio/MPLSensor.cpp @@ -31,12 +31,12 @@ #include <sys/syscall.h> #include <dlfcn.h> #include <pthread.h> +#include <cutils/atomic.h> #include <cutils/log.h> #include <utils/KeyedVector.h> #include <utils/String8.h> #include <string.h> #include <linux/input.h> -#include <utils/Atomic.h> #include "MPLSensor.h" #include "PressureSensor.IIO.secondary.h" diff --git a/65xx/libsensors_iio/sensors_mpl.cpp b/65xx/libsensors_iio/sensors_mpl.cpp index 5d52b1a..5c8397c 100644 --- a/65xx/libsensors_iio/sensors_mpl.cpp +++ b/65xx/libsensors_iio/sensors_mpl.cpp @@ -27,7 +27,7 @@ #include <linux/input.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include "sensors.h" |