diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-04-15 13:31:05 -0700 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2015-10-19 12:16:41 -0700 |
| commit | 5257b14d60cffa996bb656e0a22821b881932de1 (patch) | |
| tree | 08558c8d398a12be0135087b96cb490427bbb7ad /ril | |
| parent | 961fd02e9bf25a8ee74938a7aa98aac0aff5474f (diff) | |
| download | android_hardware_samsung-5257b14d60cffa996bb656e0a22821b881932de1.tar.gz android_hardware_samsung-5257b14d60cffa996bb656e0a22821b881932de1.tar.bz2 android_hardware_samsung-5257b14d60cffa996bb656e0a22821b881932de1.zip | |
Fix build issues after the merge
Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569
Diffstat (limited to 'ril')
| -rw-r--r-- | ril/libril/Android.mk | 5 | ||||
| -rw-r--r-- | ril/libril/RilSapSocket.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk index a310d73..3eaf2fe 100644 --- a/ril/libril/Android.mk +++ b/ril/libril/Android.mk @@ -20,7 +20,7 @@ LOCAL_SHARED_LIBRARIES := \ librilutils \ LOCAL_STATIC_LIBRARIES := \ - libnanopb-c-2.8.0-enable_malloc \ + libprotobuf-c-nano-enable_malloc \ ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),) LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262 @@ -56,7 +56,8 @@ LOCAL_SRC_FILES:= \ LOCAL_STATIC_LIBRARIES := \ libutils_static \ libcutils \ - librilutils_static + librilutils_static \ + libprotobuf-c-nano-enable_malloc ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),) LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262 diff --git a/ril/libril/RilSapSocket.cpp b/ril/libril/RilSapSocket.cpp index 92cc98c..36277cf 100644 --- a/ril/libril/RilSapSocket.cpp +++ b/ril/libril/RilSapSocket.cpp @@ -24,6 +24,7 @@ #define LOG_TAG "RIL_UIM_SOCKET" #include <utils/Log.h> #include <arpa/inet.h> +#include <errno.h> RilSapSocket::RilSapSocketList *head; |