diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 13:03:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 13:03:46 +0000 |
| commit | a8e01ac3a98bd2d5cfa2eaa60c50afd07decf3b4 (patch) | |
| tree | bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320 | |
| parent | 11e5ff75af866f91622b6008fa13db1c3685ae69 (diff) | |
| parent | 47d776d2777622c121297dcc4c59057b4f5ad3e0 (diff) | |
| download | invensense-a8e01ac3a98bd2d5cfa2eaa60c50afd07decf3b4.tar.gz | |
Merge "Don't use cutils/Atomic.h" am: 9355446812 am: 6867db2980android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 47d776d277
Change-Id: I5a2d00d8ec556d9cf2030e06a733347522b69759
| -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" |