diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-23 14:58:50 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2018-02-23 15:02:42 -0800 |
| commit | fb7952f57e07c68cc66a3ec69f86694057f89def (patch) | |
| tree | 9f8aaf91b41c21ac0cffcd189e4892da573cab23 | |
| parent | c65d52ff78ec8e5e4752be16c7c6d1bc31ca9593 (diff) | |
Don't use cutils/Atomic.h
Test: builds
Change-Id: I74485a5cbecb8710714f7bf3e54da61dd787838f
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_os_Parcel.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_util_Binder.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/Asset.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 | ||||
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 2 | ||||
| -rw-r--r-- | native/android/storage_manager.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 6526123aba13..78a2d4a69c15 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -29,11 +29,11 @@ #include <signal.h> #include <time.h> +#include <cutils/atomic.h> #include <cutils/properties.h> #include <androidfw/AssetManager.h> #include <binder/IPCThreadState.h> -#include <utils/Atomic.h> #include <utils/Errors.h> #include <utils/Log.h> #include <utils/SystemClock.h> diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index f0ac79acd7de..a5a3986e7cfd 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -28,9 +28,9 @@ #include <sys/types.h> #include <unistd.h> -#include <utils/Atomic.h> #include <binder/IInterface.h> #include <binder/IPCThreadState.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/SystemClock.h> #include <utils/List.h> diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 93abc6359b57..a04094099cc2 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -34,8 +34,8 @@ #include <binder/IPCThreadState.h> #include <binder/Parcel.h> #include <binder/ProcessState.h> +#include <cutils/atomic.h> #include <log/log.h> -#include <utils/Atomic.h> #include <utils/KeyedVector.h> #include <utils/List.h> #include <utils/Log.h> diff --git a/libs/androidfw/Asset.cpp b/libs/androidfw/Asset.cpp index 247458d3f4fd..c512a6b06ed1 100644 --- a/libs/androidfw/Asset.cpp +++ b/libs/androidfw/Asset.cpp @@ -26,7 +26,7 @@ #include <androidfw/Util.h> #include <androidfw/ZipFileRO.h> #include <androidfw/ZipUtils.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/FileMap.h> #include <utils/Log.h> #include <utils/threads.h> diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 5603508eaf09..b4ccae758347 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -28,7 +28,7 @@ #include <androidfw/misc.h> #include <androidfw/ResourceTypes.h> #include <androidfw/ZipFileRO.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/String8.h> #include <utils/String8.h> diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 7a0ef2b770ce..b184d12b674d 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -32,7 +32,7 @@ #include <androidfw/ByteBucketArray.h> #include <androidfw/ResourceTypes.h> #include <androidfw/TypeWrappers.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/ByteOrder.h> #include <utils/Debug.h> #include <utils/Log.h> diff --git a/native/android/storage_manager.cpp b/native/android/storage_manager.cpp index 137b72cf14e3..bf15b8d075e7 100644 --- a/native/android/storage_manager.cpp +++ b/native/android/storage_manager.cpp @@ -21,7 +21,7 @@ #include <binder/Binder.h> #include <binder/IServiceManager.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include <utils/RefBase.h> #include <utils/String8.h> |