commit 494dd2187eb64edec686adbc1af191aec4bf2782
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 05 22:42:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 05 22:42:18 2017 +0000
tree fce3eb8b7610101c2835b0deb06601cf25b201c0
parent 35e9310a95df4fad4457d3cc91638bcae64fa415
parent e196178adb324e4c1e3614e5940825422485482a

Merge "rild.c: Use log/log.h instead of utils/Log.h" into oc-dev

rild/Android.mk

diff --git a/rild/Android.mk b/rild/Android.mk
index 50a4379..abcc522 100644
--- a/rild/Android.mk
+++ b/rild/Android.mk
@@ -26,9 +26,7 @@
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE:= rild
-LOCAL_MODULE_TAGS := optional
 LOCAL_INIT_RC := rild.rc
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libril
+include $(BUILD_EXECUTABLE)
 
-include $(BUILD_EXECUTABLE)
\ No newline at end of file

rild/rild.c

diff --git a/rild/rild.c b/rild/rild.c
index 4c28fc0..fb4955a 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -26,7 +26,7 @@
 
 #include <telephony/ril.h>
 #define LOG_TAG "RILD"
-#include <utils/Log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include <cutils/sockets.h>
 #include <sys/capability.h>