commit a8e01ac3a98bd2d5cfa2eaa60c50afd07decf3b4
author Steven Moreland <smoreland@google.com> Wed Feb 28 13:03:46 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 28 13:03:46 2018 +0000
tree bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320
parent 11e5ff75af866f91622b6008fa13db1c3685ae69
parent 47d776d2777622c121297dcc4c59057b4f5ad3e0

Merge "Don't use cutils/Atomic.h" am: 9355446812 am: 6867db2980
am: 47d776d277

Change-Id: I5a2d00d8ec556d9cf2030e06a733347522b69759

6515/libsensors_iio/MPLSensor.cpp

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"

6515/libsensors_iio/sensors_mpl.cpp

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>
 

65xx/libsensors_iio/MPLSensor.cpp

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"

65xx/libsensors_iio/sensors_mpl.cpp

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"