summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Tarasikov <alexander.tarasikov@gmail.com>2012-07-23 17:46:45 +0400
committerAlexander Tarasikov <alexander.tarasikov@gmail.com>2012-07-23 17:47:15 +0400
commitad95b98c568e6b7dfdb21a57399ec847cd42b6ac (patch)
treec8670ac0da6098b3237cb639d72384e1faa0b346
parentf983cff792b4e4e0c8a67ef1556173af321c3126 (diff)
downloadhardware_ril_samsung-ril-ad95b98c568e6b7dfdb21a57399ec847cd42b6ac.zip
hardware_ril_samsung-ril-ad95b98c568e6b7dfdb21a57399ec847cd42b6ac.tar.gz
hardware_ril_samsung-ril-ad95b98c568e6b7dfdb21a57399ec847cd42b6ac.tar.bz2
Fix compilation on jellybean
-rw-r--r--Android.mk4
-rw-r--r--samsung-ril.h14
-rw-r--r--util.c2
3 files changed, 18 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index df39ffc..58928c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,7 +41,7 @@ LOCAL_SRC_FILES := \
rfs.c
LOCAL_SHARED_LIBRARIES := \
- libcutils libutils libril
+ libcutils libutils libril liblog
LOCAL_STATIC_LIBRARIES := libsamsung-ipc
@@ -100,7 +100,7 @@ LOCAL_PRELINK_MODULE := false
ifeq (foo,foo)
# build shared library
LOCAL_SHARED_LIBRARIES += \
- libcutils libnetutils libutils
+ libcutils libnetutils libutils liblog
LOCAL_LDLIBS += -lpthread
LOCAL_CFLAGS += -DRIL_SHLIB
LOCAL_MODULE:= libsamsung-ril
diff --git a/samsung-ril.h b/samsung-ril.h
index f6db9d8..acb5077 100644
--- a/samsung-ril.h
+++ b/samsung-ril.h
@@ -27,6 +27,20 @@
#include <telephony/ril.h>
#include <radio.h>
+#include <cutils/log.h>
+
+#ifndef LOGE
+ #define LOGE ALOGE
+#endif
+
+#ifndef LOGI
+ #define LOGI ALOGI
+#endif
+
+#ifndef LOGD
+ #define LOGD ALOGD
+#endif
+
#include "ipc.h"
#include "srs.h"
diff --git a/util.c b/util.c
index 47cb2c0..5150c82 100644
--- a/util.c
+++ b/util.c
@@ -25,6 +25,8 @@
#include <utils/Log.h>
#include "util.h"
+#include "samsung-ril.h"
+
/**
* Converts a hexidecimal string to binary
*/