commit 5257b14d60cffa996bb656e0a22821b881932de1
author Vinit Deshpande <vinitd@google.com> Wed Apr 15 13:31:05 2015 -0700
committer Ethan Chen <intervigil@gmail.com> Mon Oct 19 12:16:41 2015 -0700
tree 08558c8d398a12be0135087b96cb490427bbb7ad
parent 961fd02e9bf25a8ee74938a7aa98aac0aff5474f

Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569

ril/libril/Android.mk

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 @@
     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_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

ril/libril/RilSapSocket.cpp

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;