commit 1b1ec2dc592aa12d4bb5a3755658f1bbfcd1b171
author Vinit Deshpande <vinitd@google.com> Wed Apr 15 13:31:05 2015 -0700
committer Vinit Deshpande <vinitd@google.com> Wed Apr 15 13:31:05 2015 -0700
tree dd1bda74c5674b822212c89b1ba635155e299b0c
parent fd08733077d63c6e50e913cdf33714ba08940cbc

Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569

libril/Android.mk

diff --git a/libril/Android.mk b/libril/Android.mk
index 5ac5fb3..3f1d3e8 100644
--- a/libril/Android.mk
+++ b/libril/Android.mk
@@ -18,7 +18,7 @@
     librilutils \
 
 LOCAL_STATIC_LIBRARIES := \
-    libnanopb-c-2.8.0-enable_malloc \
+    libprotobuf-c-nano-enable_malloc \
 
 #LOCAL_CFLAGS := -DANDROID_MULTI_SIM -DDSDA_RILD1
 
@@ -49,7 +49,7 @@
     libutils_static \
     libcutils \
     librilutils_static \
-    libnanopb-c-2.8.0-enable_malloc \
+    libprotobuf-c-nano-enable_malloc
 
 LOCAL_CFLAGS :=
 

libril/RilSapSocket.cpp

diff --git a/libril/RilSapSocket.cpp b/libril/RilSapSocket.cpp
index 92cc98c..36277cf 100644
--- a/libril/RilSapSocket.cpp
+++ b/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;
 

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 4aea484..052399e 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -303,10 +303,10 @@
 
 #ifdef RIL_SHLIB
 #if defined(ANDROID_MULTI_SIM)
-extern "C" void RIL_onUnsolicitedResponse(int unsolResponse, void *data,
+extern "C" void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
                                 size_t datalen, RIL_SOCKET_ID socket_id);
 #else
-extern "C" void RIL_onUnsolicitedResponse(int unsolResponse, void *data,
+extern "C" void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
                                 size_t datalen);
 #endif
 #endif