Introduction of the new SAP-UIM socket
Added new socket connection for communication between the SAP module
in Telephony and User Identity Module with DSDA support.
New classes added are:
RilSocket
---------
Base class(virtual) for any type of socket. Has listen
and commands callbacks similar to that of the existing
telephony->rild socket.
RilSapSocket
------------
Derived class for socket for communication between BT SAP
and the sim module in the modem. It initialises
socket, calls Sap_Uim_Init to get the handles and
starts the socket thread.
rilSocketQueue
--------------
Queue for managing socket requests.
Change-Id: I8828173941d6ae76f1f9cc0d567efaf41a77d175
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 71278b0..a310d73 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -7,7 +7,9 @@
LOCAL_SRC_FILES:= \
ril.cpp \
- ril_event.cpp
+ ril_event.cpp\
+ RilSocket.cpp \
+ RilSapSocket.cpp \
LOCAL_SHARED_LIBRARIES := \
liblog \
@@ -15,7 +17,10 @@
libbinder \
libcutils \
libhardware_legacy \
- librilutils
+ librilutils \
+
+LOCAL_STATIC_LIBRARIES := \
+ libnanopb-c-2.8.0-enable_malloc \
ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262
@@ -30,10 +35,15 @@
LOCAL_CFLAGS := -DMODEM_TYPE_M7450
endif
+LOCAL_C_INCLUDES += $(TARGET_OUT_HEADER)/librilutils
+LOCAL_C_INCLUDES += external/nanopb-c
+
LOCAL_MODULE:= libril
-include $(BUILD_SHARED_LIBRARY)
+LOCAL_COPY_HEADERS_TO := libril
+LOCAL_COPY_HEADERS := ril_ex.h
+include $(BUILD_SHARED_LIBRARY)
# For RdoServD which needs a static library
# =========================================