commit b8b2e34518311e776dd61982897a35f0b520cb0f
author Logan Chien <loganchien@google.com> Tue Apr 24 10:01:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 24 10:01:21 2018 +0000
tree 2dd0712cff22b91d5255c982e4ed67fd437f697d
parent 7c4fc7558535c9501f96df0ba3db2dd9989ba690
parent b7f05e443397ab1151588febddf7e6d5d1dbae1f

Merge "Rename <cutils/log.h> to <log/log.h>"

AsynchronousCloseMonitor.cpp

diff --git a/AsynchronousCloseMonitor.cpp b/AsynchronousCloseMonitor.cpp
index 95de317..68b810d 100644
--- a/AsynchronousCloseMonitor.cpp
+++ b/AsynchronousCloseMonitor.cpp
@@ -17,7 +17,8 @@
 #define LOG_TAG "AsynchronousCloseMonitor"
 
 #include <nativehelper/AsynchronousCloseMonitor.h>
-#include "cutils/log.h"
+
+#include <log/log.h>
 
 #include <errno.h>
 #include <signal.h>

JniInvocation.cpp

diff --git a/JniInvocation.cpp b/JniInvocation.cpp
index 51cba6d..94be4b1 100644
--- a/JniInvocation.cpp
+++ b/JniInvocation.cpp
@@ -23,7 +23,7 @@
 #include <cstddef>
 
 #define LOG_TAG "JniInvocation"
-#include "cutils/log.h"
+#include <log/log.h>
 
 #ifdef __ANDROID__
 #include <sys/system_properties.h>