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

Commit 112d1dcd authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: use log/log.h for ALOG macros" 

am: dd9fa240

Change-Id: I567d9f71c6407a7cb96ffa2e910a4b1c05876c87
parents f9026b10 dd9fa240

debuggerd/crasher.cpp

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



// We test both kinds of logging.

#include <android/log.h>

#include <android-base/logging.h>

#include <log/log.h>



#if defined(STATIC_CRASHER)

#include "debuggerd/client.h"

include/utils/KeyedVector.h

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

#include <sys/types.h>



#include <android/log.h>

#include <log/log.h>

#include <utils/Errors.h>

#include <utils/SortedVector.h>

#include <utils/TypeHelpers.h>