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

Commit 68618d98 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Don't use cutils/Atomic.h" am: 07735797 am: a272d540 am: 0f4ca4a5"

parents 924367f6 df7675f1

cmds/bootanimation/BootAnimation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/jni/android_os_Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/jni/android_util_Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

libs/androidfw/Asset.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

libs/androidfw/AssetManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>