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

am: 072aaa2e39 Change-Id: I3502ec89eed45da2d052fb274d08fcb7c1c62f1b
6 years ago · db95974090
parent 485366ec55 072aaa2e39
commit db95974090
2 changed files with 2 additions and 2 deletions
--- 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>
--- 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>

@ -39,7 +40,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>