Merge "liblog: use log/log.h for ALOG macros" am: dd9fa24091
am: 112d1dcd95
am: 33807cd6c2
am: 07388af1e6
Change-Id: I3789497189d23724824babaacbc8aa442e7a026c
This commit is contained in:
commit
5c8bdf42e7
2 changed files with 2 additions and 2 deletions
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue