commit 54c28999afa7834a8dbc6079a2707598a37db56f
author Steven Moreland <smoreland@google.com> Mon Feb 26 18:34:17 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 26 18:34:17 2018 +0000
tree 2677c29642cc1c92056ac37a802f4c53d51787f7
parent 218f8e3bec0070731bff41513b19f64d481dad24
parent db959740904eba27582feee48234463f3553b199

Merge "Don't use cutils/Atomic.h" am: 853996e7b2 am: 072aaa2e39
am: db95974090

Change-Id: I7f930bda6e51c0d4368747f8e4a0eac92e68b2fd

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 9a30f71..229e08e 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -39,8 +39,8 @@
 #include <memunreachable/memunreachable.h>
 #include <utils/String16.h>
 #include <utils/threads.h>
-#include <utils/Atomic.h>
 
+#include <cutils/atomic.h>
 #include <cutils/properties.h>
 
 #include <system/audio.h>

services/audioflinger/AudioFlinger.h

diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index ebd1b18..0e2da4e 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -27,6 +27,7 @@
 
 #include <android-base/macros.h>
 
+#include <cutils/atomic.h>
 #include <cutils/compiler.h>
 #include <cutils/properties.h>
 
@@ -38,7 +39,6 @@
 #include <media/MmapStreamInterface.h>
 #include <media/MmapStreamCallback.h>
 
-#include <utils/Atomic.h>
 #include <utils/Errors.h>
 #include <utils/threads.h>
 #include <utils/SortedVector.h>