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

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

Merge "Don't use cutils/Atomic.h" 

am: 8f4529bb

Change-Id: I7b534644fac1852b37845956da1b13c8bdc86976
parents 658c49b5 8f4529bb

libs/binder/BufferedTextOutput.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
#include <binder/BufferedTextOutput.h>

#include <binder/Debug.h>



#include <utils/Atomic.h>

#include <cutils/atomic.h>

#include <cutils/threads.h>

#include <utils/Log.h>

#include <utils/RefBase.h>

#include <utils/Vector.h>

#include <cutils/threads.h>



#include <private/binder/Static.h>

libs/binder/ProcessState.cpp

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 


#include <binder/ProcessState.h>



#include <utils/Atomic.h>

#include <binder/BpBinder.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <cutils/atomic.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <binder/IServiceManager.h>

#include <utils/String8.h>

#include <utils/threads.h>

opengl/libagl/BufferObjectManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <stddef.h>

#include <sys/types.h>



#include <utils/Atomic.h>

#include <cutils/atomic.h>

#include <utils/RefBase.h>

#include <utils/KeyedVector.h>

#include <utils/Errors.h>

opengl/libagl/TextureObjectManager.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <stddef.h>

#include <sys/types.h>



#include <utils/Atomic.h>

#include <cutils/atomic.h>

#include <utils/threads.h>

#include <utils/RefBase.h>

#include <utils/KeyedVector.h>

services/sensorservice/BatteryService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <math.h>

#include <sys/types.h>



#include <utils/Atomic.h>

#include <cutils/atomic.h>

#include <utils/Errors.h>

#include <utils/Singleton.h>