From af1854b3be3410f3090a967cfee8b387d6ad3950 Mon Sep 17 00:00:00 2001
From: PaulK <contact@paulk.fr>
Date: Sat, 28 Jan 2012 11:31:59 +0100
Subject: Switched crespo headers to ipc-v4 as these are shared between
 multiple devices

---
 Android.mk | 62 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 22 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 8e79c8f..11d941f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,30 +7,22 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libsamsung-ipc
 LOCAL_MODULE_TAGS := optional
 
-samsung-ipc_files := \
-	samsung-ipc/ipc.c \
-	samsung-ipc/ipc_util.c \
-	samsung-ipc/util.c \
-	samsung-ipc/rfs.c \
-	samsung-ipc/gen.c \
-	samsung-ipc/gprs.c \
-	samsung-ipc/misc.c \
-	samsung-ipc/net.c \
-	samsung-ipc/sec.c \
-	samsung-ipc/device/$(TARGET_DEVICE)/$(TARGET_DEVICE)_ipc.c
-
 LOCAL_CFLAGS += -Iexternal/openssl/include
 LOCAL_LDFLAGS += -lcrypto
 
 ifeq ($(TARGET_DEVICE),crespo)
-	LOCAL_CFLAGS += -DDEVICE_CRESPO
+	LOCAL_CFLAGS += -DDEVICE_IPC_V4
+	samsung-ipc_device := crespo
 endif
 
 ifeq ($(TARGET_DEVICE),galaxysmtd)
-	device_files := samsung-ipc/device/$(TARGET_DEVICE)/$(TARGET_DEVICE)_nv_data.c
-	LOCAL_CFLAGS += -Iexternal/openssl/include
-	LOCAL_LDFLAGS += -lcrypto
-	LOCAL_CFLAGS += -DDEVICE_CRESPO
+	LOCAL_CFLAGS += -DDEVICE_IPC_V4
+	samsung-ipc_device := aries
+endif
+
+ifeq ($(TARGET_DEVICE),galaxytab)
+	LOCAL_CFLAGS += -DDEVICE_IPC_V4
+	samsung-ipc_device := aries
 endif
 
 ifeq ($(TARGET_DEVICE),h1)
@@ -42,7 +34,19 @@ ifeq ($(DEBUG),true)
 	LOCAL_CFLAGS += -DLOG_STDOUT
 endif
 
-LOCAL_SRC_FILES := $(samsung-ipc_files) $(device_files)
+samsung-ipc_files := \
+	samsung-ipc/ipc.c \
+	samsung-ipc/ipc_util.c \
+	samsung-ipc/util.c \
+	samsung-ipc/rfs.c \
+	samsung-ipc/gen.c \
+	samsung-ipc/gprs.c \
+	samsung-ipc/misc.c \
+	samsung-ipc/net.c \
+	samsung-ipc/sec.c \
+	samsung-ipc/device/$(samsung-ipc_device)/$(samsung-ipc_device)_ipc.c
+
+LOCAL_SRC_FILES := $(samsung-ipc_files)
 
 LOCAL_SHARED_LIBRARIES := libutils
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \
@@ -57,18 +61,32 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ipc-modemctrl
 LOCAL_MODULE_TAGS := optional
 
-modemctrl_files := tools/modemctrl.c
-
 ifeq ($(TARGET_DEVICE),crespo)
-	LOCAL_CFLAGS += -DDEVICE_CRESPO
+	LOCAL_CFLAGS += -DDEVICE_IPC_V4
+	samsung-ipc_device := crespo
 endif
+
 ifeq ($(TARGET_DEVICE),galaxysmtd)
-	LOCAL_CFLAGS += -DDEVICE_CRESPO
+	LOCAL_CFLAGS += -DDEVICE_IPC_V4
+	samsung-ipc_device := aries
+endif
+
+ifeq ($(TARGET_DEVICE),galaxytab)
+	LOCAL_CFLAGS += -DDEVICE_IPC_V4
+	samsung-ipc_device := aries
 endif
+
 ifeq ($(TARGET_DEVICE),h1)
 	LOCAL_CFLAGS += -DDEVICE_H1
 endif
 
+ifeq ($(DEBUG),true)
+	LOCAL_CFLAGS += -DDEBUG
+	LOCAL_CFLAGS += -DLOG_STDOUT
+endif
+
+modemctrl_files := tools/modemctrl.c
+
 LOCAL_SRC_FILES := $(modemctrl_files)
 
 LOCAL_STATIC_LIBRARIES := libsamsung-ipc
-- 
cgit v1.1