aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSimon Busch <morphis@gravedo.de>2012-02-03 20:34:15 +0100
committerSimon Busch <morphis@gravedo.de>2012-02-03 20:34:15 +0100
commite8bec379a346442f3719eb3e76fbf79697622754 (patch)
tree0ce63e73fc639f49619cc1e2e48205b02aa20e81 /Android.mk
parentc41dcc61f8271b1459f2ae6d27777b5580c08a6b (diff)
parent1789f2ac0766851f078c754fe31cb87a6f013184 (diff)
downloadexternal_libsamsung-ipc-e8bec379a346442f3719eb3e76fbf79697622754.zip
external_libsamsung-ipc-e8bec379a346442f3719eb3e76fbf79697622754.tar.gz
external_libsamsung-ipc-e8bec379a346442f3719eb3e76fbf79697622754.tar.bz2
Merge remote-tracking branch 'origin/paulk/rework-device-specific' into morphis/rework-device-specific
Conflicts: include/radio.h samsung-ipc/ipc.c samsung-ipc/ipc_private.h
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 11d941f..8997e80 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,7 @@ endif
samsung-ipc_files := \
samsung-ipc/ipc.c \
samsung-ipc/ipc_util.c \
+ samsung-ipc/ipc_devices.c \
samsung-ipc/util.c \
samsung-ipc/rfs.c \
samsung-ipc/gen.c \