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

am: 112d1dcd95 Change-Id: Iab735fcd94483bff17ef08bd48b471a26beb6de1
2017-01-12 23:52:07 +00:00 · 2017-01-12 23:52:07 +00:00 · 33807cd6c2
parent b936ca317b 112d1dcd95
commit 33807cd6c2
2 changed files with 2 additions and 2 deletions
--- a/debuggerd/crasher.cpp
+++ b/debuggerd/crasher.cpp
@ -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"
--- a/include/utils/KeyedVector.h
+++ b/include/utils/KeyedVector.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>