diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-04-04 16:38:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-04 16:38:19 +0000 |
| commit | 0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522 (patch) | |
| tree | 765c153714b2ae39ef20f8ed8a8111f7a936572a /rild | |
| parent | 347a99fe02580bda0dc33f0817e0e28a4089118d (diff) | |
| parent | 2ef2ec65b1323129f8b3a0f6090e85843966dffd (diff) | |
| download | android_hardware_ril-0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522.tar.gz android_hardware_ril-0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522.tar.bz2 android_hardware_ril-0ed5b5f1d54b84c4519fb8c9a76c7e46b470e522.zip | |
Merge "rild.c: Use log/log.h instead of utils/Log.h" am: 210d7d9059 am: 35a9183f59
am: 2ef2ec65b1
Change-Id: Ic95e1868489b0564d994d2f927eb017cf288a6a2
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 0ce9eaf..f455cbe 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> |