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

Commit b597d797 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h"

parents 185f9aee 4dad9ce0

libs/binder/MemoryHeapBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
#include <unistd.h>



#include <binder/MemoryHeapBase.h>

#include <log/log.h>

#include <cutils/ashmem.h>

#include <cutils/atomic.h>

#include <log/log.h>



namespace android {

services/surfaceflinger/SurfaceInterceptor.cpp

+3 −5
Original line number Diff line number Diff line
@@ -21,14 +21,12 @@ 
#include "SurfaceFlinger.h"

#include "SurfaceInterceptor.h"



#include <android-base/file.h>



#include <cutils/log.h>

#include <fstream>



#include <android-base/file.h>

#include <log/log.h>

#include <utils/Trace.h>



#include <fstream>



namespace android {



// ----------------------------------------------------------------------------

services/surfaceflinger/SurfaceInterceptor.h

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 


#include <mutex>



#include <utils/SortedVector.h>

#include <utils/Vector.h>



namespace android {



class BufferItem;