diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 14:13:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 14:13:52 +0000 |
| commit | df7675f1cb184f09b2a304d1aa8a25112d6b340f (patch) | |
| tree | b0b2e7f23e976ba854c7403360da3ea0d681eacf | |
| parent | efab39ff7f06323568f6b1a401209f06521486d3 (diff) | |
| parent | 0f4ca4a5c086899f4ab842ae70eb4c9474d2547a (diff) | |
Merge "Don't use cutils/Atomic.h" am: 07735797a2 am: a272d540d8
am: 0f4ca4a5c0
Change-Id: I4b9798b39d890537f888415b5ac283227970e4de
| -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 54785ca13185..8ffe5bf59315 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 d18c17269181..5e2cd4001d23 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 d17993a72aaf..1b206fd8abdd 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -35,8 +35,8 @@ #include <binder/Parcel.h> #include <binder/BpBinder.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 a5698af18f6b..fc625bbaf72d 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 696a00c7b2c0..6268c40f34b4 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> |