Diff between 3d3f496f4eba55d7977b6570b22a7650fe688348 and cd7eed3370e31662665c2f06f919117b65a8d3bc

Changed Files

File Additions Deletions Status
android/Android.mk +4 -4 modified

Full Patch

diff --git a/android/Android.mk b/android/Android.mk
index ff71089..289c1df 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -289,7 +289,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	bluez/monitor/main.c \
-	bluez/monitor/mainloop.c \
 	bluez/monitor/display.c \
 	bluez/monitor/hcidump.c \
 	bluez/monitor/control.c \
@@ -311,6 +310,7 @@ LOCAL_SRC_FILES := \
 	bluez/src/shared/queue.c \
 	bluez/src/shared/crypto.c \
 	bluez/src/shared/btsnoop.c \
+	bluez/src/shared/mainloop.c \
 	bluez/lib/hci.c \
 	bluez/lib/bluetooth.c \
 
@@ -338,7 +338,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	bluez/tools/btproxy.c \
-	bluez/monitor/mainloop.c \
+	bluez/src/shared/mainloop.c \
 	bluez/src/shared/util.c \
 
 LOCAL_C_INCLUDES := \
@@ -445,7 +445,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	bluez/android/bluetoothd-snoop.c \
-	bluez/monitor/mainloop.c \
+	bluez/src/shared/mainloop.c \
 	bluez/src/shared/btsnoop.c \
 	bluez/android/log.c \
 
@@ -486,7 +486,7 @@ LOCAL_SRC_FILES := \
 	bluez/tools/btmgmt.c \
 	bluez/lib/bluetooth.c \
 	bluez/lib/sdp.c \
-	bluez/monitor/mainloop.c \
+	bluez/src/shared/mainloop.c \
 	bluez/src/shared/io-mainloop.c \
 	bluez/src/shared/mgmt.c \
 	bluez/src/shared/queue.c \