commit 0b764f701bc77ce37831612814cbe95457e0411c
author Mark Salyzyn <salyzyn@google.com> Thu Jan 12 15:44:06 2017 -0800
committer Mark Salyzyn <salyzyn@google.com> Thu Jan 12 15:44:06 2017 -0800
tree 363c8e246e1b41e568e6f718f2520d8fc7d6f931
parent e520904f7ab13b076145e5984c9e8f0a0a1c84ab

liblog: use log/log.h for ALOG macros

Test: compile
Bug: 34250038
Change-Id: I0f56c563871f377c03380498cd867b916892f1dc

debuggerd/crasher.cpp

diff --git a/debuggerd/crasher.cpp b/debuggerd/crasher.cpp
index e650f22..689f4d4 100644
--- 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"

include/utils/KeyedVector.h

diff --git a/include/utils/KeyedVector.h b/include/utils/KeyedVector.h
index 42de401..f93ad6e 100644
--- 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>