diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-23 14:57:20 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2018-02-23 15:02:42 -0800 |
| commit | 2716e111df2b7cd2490029f4c88bcc6543c93416 (patch) | |
| tree | 4d63083e7ab65b8c5c7c9520ee2c187daf20fd3a | |
| parent | e9f6953dea90f262e3c22e90001ee458b3ea40c2 (diff) | |
| download | native-2716e111df2b7cd2490029f4c88bcc6543c93416.tar.gz | |
Don't use cutils/Atomic.h
Test: builds
Change-Id: Idb7a51db4382e1012afe12df3c9fe807922b17fe
| -rw-r--r-- | libs/binder/BufferedTextOutput.cpp | 4 | ||||
| -rw-r--r-- | libs/binder/ProcessState.cpp | 4 | ||||
| -rw-r--r-- | opengl/libagl/BufferObjectManager.cpp | 2 | ||||
| -rw-r--r-- | opengl/libagl/TextureObjectManager.h | 2 | ||||
| -rw-r--r-- | services/sensorservice/BatteryService.cpp | 2 | ||||
| -rw-r--r-- | services/sensorservice/SensorDevice.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/libs/binder/BufferedTextOutput.cpp b/libs/binder/BufferedTextOutput.cpp index a2443c081f..30e70b074e 100644 --- a/libs/binder/BufferedTextOutput.cpp +++ b/libs/binder/BufferedTextOutput.cpp @@ -17,11 +17,11 @@ #include <binder/BufferedTextOutput.h> #include <binder/Debug.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> +#include <cutils/threads.h> #include <utils/Log.h> #include <utils/RefBase.h> #include <utils/Vector.h> -#include <cutils/threads.h> #include <private/binder/Static.h> diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index da806aa25d..860612983f 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -18,12 +18,12 @@ #include <binder/ProcessState.h> -#include <utils/Atomic.h> #include <binder/BpBinder.h> #include <binder/IPCThreadState.h> +#include <binder/IServiceManager.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/String8.h> -#include <binder/IServiceManager.h> #include <utils/String8.h> #include <utils/threads.h> diff --git a/opengl/libagl/BufferObjectManager.cpp b/opengl/libagl/BufferObjectManager.cpp index 6bf28ee322..3d93c190ba 100644 --- a/opengl/libagl/BufferObjectManager.cpp +++ b/opengl/libagl/BufferObjectManager.cpp @@ -18,7 +18,7 @@ #include <stddef.h> #include <sys/types.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/RefBase.h> #include <utils/KeyedVector.h> #include <utils/Errors.h> diff --git a/opengl/libagl/TextureObjectManager.h b/opengl/libagl/TextureObjectManager.h index de9e03eab8..9cf8771329 100644 --- a/opengl/libagl/TextureObjectManager.h +++ b/opengl/libagl/TextureObjectManager.h @@ -21,7 +21,7 @@ #include <stddef.h> #include <sys/types.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/threads.h> #include <utils/RefBase.h> #include <utils/KeyedVector.h> diff --git a/services/sensorservice/BatteryService.cpp b/services/sensorservice/BatteryService.cpp index 330861d5dc..d8e5b290d0 100644 --- a/services/sensorservice/BatteryService.cpp +++ b/services/sensorservice/BatteryService.cpp @@ -18,7 +18,7 @@ #include <math.h> #include <sys/types.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Errors.h> #include <utils/Singleton.h> diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp index 535d0db2d2..4daae4d141 100644 --- a/services/sensorservice/SensorDevice.cpp +++ b/services/sensorservice/SensorDevice.cpp @@ -18,7 +18,7 @@ #include <android-base/logging.h> #include <sensors/convert.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Errors.h> #include <utils/Singleton.h> diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 1b77aafc58..821e15c84c 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -28,8 +28,8 @@ */ #include <cutils/compiler.h> +#include <cutils/atomic.h> -#include <utils/Atomic.h> #include <utils/Errors.h> #include <utils/KeyedVector.h> #include <utils/RefBase.h> |