diff options
| author | PaulK <contact@paulk.fr> | 2011-10-23 13:38:34 +0200 |
|---|---|---|
| committer | PaulK <contact@paulk.fr> | 2011-10-23 13:40:24 +0200 |
| commit | 3081adc9b75f394badb03e22dfb611b15badac5f (patch) | |
| tree | 23edf9965c103164a9e6cabb9dc5179f042d2980 | |
| parent | eb4b7e1bba7db0368042a44d7f1e44c70a3a5b70 (diff) | |
| download | external_libsamsung-ipc-3081adc9b75f394badb03e22dfb611b15badac5f.zip external_libsamsung-ipc-3081adc9b75f394badb03e22dfb611b15badac5f.tar.gz external_libsamsung-ipc-3081adc9b75f394badb03e22dfb611b15badac5f.tar.bz2 | |
Updated Android.mk and added return 0; to make it build on Android.
| -rw-r--r-- | Android.mk | 43 | ||||
| -rw-r--r-- | samsung-ipc/ipc.c | 2 |
2 files changed, 14 insertions, 31 deletions
@@ -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) - diff --git a/samsung-ipc/ipc.c b/samsung-ipc/ipc.c index fa4ddea..f67bef2 100644 --- a/samsung-ipc/ipc.c +++ b/samsung-ipc/ipc.c @@ -91,6 +91,8 @@ int ipc_client_set_log_handler(struct ipc_client *client, ipc_client_log_handler client->log_handler = log_handler_cb; client->log_data = user_data; + + return 0; } |