From 3081adc9b75f394badb03e22dfb611b15badac5f Mon Sep 17 00:00:00 2001
From: PaulK <contact@paulk.fr>
Date: Sun, 23 Oct 2011 13:38:34 +0200
Subject: Updated Android.mk and added return 0; to make it build on Android.

---
 Android.mk | 43 ++++++++++++-------------------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index dacd080..082c81c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,42 +1,23 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-libsamsung-ipc_files := \
-	ipc.c \
-	ipc_util.c \
-	util.c \
-	devices/$(TARGET_DEVICE)/ipc.c
-
-LOCAL_MODULE := libsamsung-ipc
+LOCAL_MODULE := ipc-modemctrl
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := $(libsamsung-ipc_files)
-
-ifeq ($(TARGET_DEVICE),crespo)
-       libsamsung-ipc_files += devices/$(TARGET_DEVICE)/nv_data.c
-       LOCAL_CFLAGS += -Iexternal/openssl/include
-       LOCAL_LDFLAGS += -lcrypto
-endif
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
+samsung-ipc_files := \
+	samsung-ipc/ipc.c \
+	samsung-ipc/ipc_util.c \
+	samsung-ipc/crespo_ipc.c \
+	samsung-ipc/crespo_nv_data.c \
+	samsung-ipc/util.c
 
-LOCAL_MODULE := ipc-test
-LOCAL_MODULE_TAGS := optional
+modemctrl_files := tools/modemctrl.c
 
+LOCAL_SRC_FILES := $(samsung-ipc_files) $(modemctrl_files)
 LOCAL_SHARED_LIBRARIES := libutils
-
-LOCAL_CFLAGS := -DLOG_STDOUT
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := $(libsamsung-ipc_files) test.c
-
-ifeq ($(TARGET_DEVICE),crespo)
-       libsamsung-ipc_files += devices/$(TARGET_DEVICE)/nv_data.c
-       LOCAL_CFLAGS += -Iexternal/openssl/include
-       LOCAL_LDFLAGS += -lcrypto
-endif
+LOCAL_CFLAGS += -Iexternal/openssl/include
+LOCAL_LDFLAGS += -lcrypto
 
+#include $(BUILD_STATIC_LIBRARY)
 include $(BUILD_EXECUTABLE)
-
-- 
cgit v1.1