Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db959740 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

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

am: 072aaa2e

Change-Id: I3502ec89eed45da2d052fb274d08fcb7c1c62f1b
parents 485366ec 072aaa2e

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,8 +39,8 @@ 
#include <memunreachable/memunreachable.h>

#include <memunreachable/memunreachable.h>

#include <utils/String16.h>

#include <utils/String16.h>

#include <utils/threads.h>

#include <utils/threads.h>

#include <utils/Atomic.h>





#include <cutils/atomic.h>

#include <cutils/properties.h>

#include <cutils/properties.h>





#include <system/audio.h>

#include <system/audio.h>

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 




#include <android-base/macros.h>

#include <android-base/macros.h>





#include <cutils/atomic.h>

#include <cutils/compiler.h>

#include <cutils/compiler.h>

#include <cutils/properties.h>

#include <cutils/properties.h>
@@ -39,7 +40,6 @@ 
#include <media/MmapStreamInterface.h>

#include <media/MmapStreamInterface.h>

#include <media/MmapStreamCallback.h>

#include <media/MmapStreamCallback.h>





#include <utils/Atomic.h>

#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/threads.h>

#include <utils/threads.h>

#include <utils/SortedVector.h>

#include <utils/SortedVector.h>