Implemented minimal ipc upper-layer in modemctrl, with auto call functions

1 files changed, 35 insertions, 5 deletions

diff --git a/Android.mk b/Android.mk
index 5b21435..aa72121 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,6 @@
+BUILD_IPC-MODEMCTRL := true
+DEBUG := true
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -14,8 +17,6 @@ samsung-ipc_files := \
 	samsung-ipc/sec.c \
 	samsung-ipc/device/$(TARGET_DEVICE)/$(TARGET_DEVICE)_ipc.c
 
-#modemctrl_files := tools/modemctrl.c
-
 ifeq ($(TARGET_DEVICE),crespo)
 	device_files := samsung-ipc/device/$(TARGET_DEVICE)/$(TARGET_DEVICE)_nv_data.c
 	LOCAL_CFLAGS += -Iexternal/openssl/include
@@ -27,12 +28,41 @@ ifeq ($(TARGET_DEVICE),h1)
 	LOCAL_CFLAGS += -DDEVICE_H1
 endif
 
-LOCAL_SRC_FILES := $(samsung-ipc_files) $(device_files) $(modemctrl_files)
+ifeq ($(DEBUG),true)
+	LOCAL_CFLAGS += -DDEBUG
+	LOCAL_CFLAGS += -DLOG_STDOUT
+endif
+
+LOCAL_SRC_FILES := $(samsung-ipc_files) $(device_files)
 
 LOCAL_SHARED_LIBRARIES := libutils
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/samsung-ipc
 
-
 include $(BUILD_STATIC_LIBRARY)
-#include $(BUILD_EXECUTABLE)
+
+ifeq ($(BUILD_IPC-MODEMCTRL),true)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ipc-modemctrl
+LOCAL_MODULE_TAGS := optional
+
+modemctrl_files := tools/modemctrl.c
+
+ifeq ($(TARGET_DEVICE),crespo)
+	LOCAL_CFLAGS += -DDEVICE_CRESPO
+endif
+ifeq ($(TARGET_DEVICE),h1)
+	LOCAL_CFLAGS += -DDEVICE_H1
+endif
+
+LOCAL_SRC_FILES := $(modemctrl_files)
+
+LOCAL_STATIC_LIBRARIES := libsamsung-ipc
+LOCAL_SHARED_LIBRARIES := libutils
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
+include $(BUILD_EXECUTABLE)
+
+endif