diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-04-04 16:42:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-04 16:42:53 +0000 |
| commit | 871b893a95dd86c64b64e1c760f384c139a80efb (patch) | |
| tree | 942b6d83823646ad06a29f87083cd02d64708373 /rild | |
| parent | dc9f31be04e81fb411b38cba165bfffdda2ced4b (diff) | |
| parent | 0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522 (diff) | |
| download | android_hardware_ril-871b893a95dd86c64b64e1c760f384c139a80efb.tar.gz android_hardware_ril-871b893a95dd86c64b64e1c760f384c139a80efb.tar.bz2 android_hardware_ril-871b893a95dd86c64b64e1c760f384c139a80efb.zip | |
Merge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059 am: 35a9183f59 am: 2ef2ec65b1
am: 0ed5b5f1d5
Change-Id: I0af09f20deffd554cef1948c7bf83e2c10d21f01
Diffstat (limited to 'rild')
| -rw-r--r-- | rild/Android.mk | 4 | ||||
| -rw-r--r-- | rild/rild.c | 2 |
2 files changed, 2 insertions, 4 deletions
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 @@ endif 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 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> |