* [PATCH v2 BlueZ 1/4] android: Fix build dependency of bluetoothd on target
@ 2013-10-23 8:08 Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 2/4] android: Fix build dependency of bluetooth.default.so HAL " Luiz Augusto von Dentz
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2013-10-23 8:08 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds missing headers necessary to build bluetoothd.
---
android/Android.mk | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/android/Android.mk b/android/Android.mk
index 7132279..d276102 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -15,18 +15,19 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
main.c \
log.c \
- adapter.c \
- hid.c \
+ adapter.c adapter.h \
+ hid.c hid.h \
ipc.c ipc.h \
- ../src/shared/mgmt.c \
- ../src/shared/util.c \
- ../src/sdpd-database.c \
- ../src/sdpd-service.c \
- ../src/sdpd-request.c \
- ../src/sdpd-server.c \
- ../lib/sdp.c \
- ../lib/bluetooth.c \
- ../lib/hci.c \
+ $(LOCAL_PATH)/../src/sdp.h \
+ $(LOCAL_PATH)/../src/shared/mgmt.c \
+ $(LOCAL_PATH)/../src/shared/util.c \
+ $(LOCAL_PATH)/../src/sdpd-database.c \
+ $(LOCAL_PATH)/../src/sdpd-service.c \
+ $(LOCAL_PATH)/../src/sdpd-request.c \
+ $(LOCAL_PATH)/../src/sdpd-server.c \
+ $(LOCAL_PATH)/../lib/sdp.c \
+ $(LOCAL_PATH)/../lib/bluetooth.c \
+ $(LOCAL_PATH)/../lib/hci.c \
LOCAL_C_INCLUDES := \
$(call include-path-for, glib) \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 BlueZ 2/4] android: Fix build dependency of bluetooth.default.so HAL on target
2013-10-23 8:08 [PATCH v2 BlueZ 1/4] android: Fix build dependency of bluetoothd on target Luiz Augusto von Dentz
@ 2013-10-23 8:08 ` Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 3/4] android: Fix build dependency of haltest " Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 4/4] android: Add variable ROOT_PATH to Android.mk Luiz Augusto von Dentz
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2013-10-23 8:08 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds missing headers necessary to build bluetooth.default.so
---
android/Android.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/android/Android.mk b/android/Android.mk
index d276102..01ef3e7 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -66,7 +66,8 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- hal-ipc.c \
+ hal.h hal-msg.h hal-log.h \
+ hal-ipc.c hal-ipc.h \
hal-bluetooth.c \
hal-sock.c \
hal-hidhost.c \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 BlueZ 3/4] android: Fix build dependency of haltest on target
2013-10-23 8:08 [PATCH v2 BlueZ 1/4] android: Fix build dependency of bluetoothd on target Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 2/4] android: Fix build dependency of bluetooth.default.so HAL " Luiz Augusto von Dentz
@ 2013-10-23 8:08 ` Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 4/4] android: Add variable ROOT_PATH to Android.mk Luiz Augusto von Dentz
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2013-10-23 8:08 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds missing headers necessary to build haltest.
---
android/Android.mk | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/android/Android.mk b/android/Android.mk
index 01ef3e7..4c87a9b 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -92,11 +92,12 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
client/haltest.c \
- client/pollhandler.c \
- client/terminal.c \
- client/history.c \
- client/textconv.c \
+ client/pollhandler.c client/pollhandler.h \
+ client/terminal.c client/terminal.h \
+ client/history.c client/history.h \
+ client/textconv.c client/textconv.h \
client/tabcompletion.c \
+ client/if-main.h \
client/if-bt.c \
client/if-hh.c \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 BlueZ 4/4] android: Add variable ROOT_PATH to Android.mk
2013-10-23 8:08 [PATCH v2 BlueZ 1/4] android: Fix build dependency of bluetoothd on target Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 2/4] android: Fix build dependency of bluetooth.default.so HAL " Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 3/4] android: Fix build dependency of haltest " Luiz Augusto von Dentz
@ 2013-10-23 8:08 ` Luiz Augusto von Dentz
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2013-10-23 8:08 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes it simpler to include files from other parts of the code.
---
android/Android.mk | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/android/Android.mk b/android/Android.mk
index 4c87a9b..20064fe 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -1,7 +1,8 @@
LOCAL_PATH := $(call my-dir)
+ROOT_PATH := $(LOCAL_PATH)/..
# Retrieve BlueZ version from configure.ac file
-BLUEZ_VERSION := $(shell grep ^AC_INIT $(LOCAL_PATH)/../configure.ac | cpp -P -D'AC_INIT(_,v)=v')
+BLUEZ_VERSION := $(shell grep ^AC_INIT $(ROOT_PATH)/configure.ac | cpp -P -D'AC_INIT(_,v)=v')
# Specify pathmap for glib
pathmap_INCL += glib:external/bluetooth/glib
@@ -18,25 +19,25 @@ LOCAL_SRC_FILES := \
adapter.c adapter.h \
hid.c hid.h \
ipc.c ipc.h \
- $(LOCAL_PATH)/../src/sdp.h \
- $(LOCAL_PATH)/../src/shared/mgmt.c \
- $(LOCAL_PATH)/../src/shared/util.c \
- $(LOCAL_PATH)/../src/sdpd-database.c \
- $(LOCAL_PATH)/../src/sdpd-service.c \
- $(LOCAL_PATH)/../src/sdpd-request.c \
- $(LOCAL_PATH)/../src/sdpd-server.c \
- $(LOCAL_PATH)/../lib/sdp.c \
- $(LOCAL_PATH)/../lib/bluetooth.c \
- $(LOCAL_PATH)/../lib/hci.c \
+ $(ROOT_PATH)/src/sdp.h \
+ $(ROOT_PATH)/src/shared/mgmt.c \
+ $(ROOT_PATH)/src/shared/util.c \
+ $(ROOT_PATH)/src/sdpd-database.c \
+ $(ROOT_PATH)/src/sdpd-service.c \
+ $(ROOT_PATH)/src/sdpd-request.c \
+ $(ROOT_PATH)/src/sdpd-server.c \
+ $(ROOT_PATH)/lib/sdp.c \
+ $(ROOT_PATH)/lib/bluetooth.c \
+ $(ROOT_PATH)/lib/hci.c \
LOCAL_C_INCLUDES := \
$(call include-path-for, glib) \
$(call include-path-for, glib)/glib \
LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/../ \
- $(LOCAL_PATH)/../src \
- $(LOCAL_PATH)/../lib \
+ $(ROOT_PATH)/ \
+ $(ROOT_PATH)/src \
+ $(ROOT_PATH)/lib \
LOCAL_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\"
@@ -51,9 +52,9 @@ lib_headers := \
sdp_lib.h \
sdp.h \
-$(shell mkdir -p $(LOCAL_PATH)/../lib/bluetooth)
+$(shell mkdir -p $(ROOT_PATH)/lib/bluetooth)
-$(foreach file,$(lib_headers), $(shell ln -sf ../$(file) $(LOCAL_PATH)/../lib/bluetooth/$(file)))
+$(foreach file,$(lib_headers), $(shell ln -sf ../$(file) $(ROOT_PATH)/lib/bluetooth/$(file)))
LOCAL_MODULE := bluetoothd
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-23 8:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-23 8:08 [PATCH v2 BlueZ 1/4] android: Fix build dependency of bluetoothd on target Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 2/4] android: Fix build dependency of bluetooth.default.so HAL " Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 3/4] android: Fix build dependency of haltest " Luiz Augusto von Dentz
2013-10-23 8:08 ` [PATCH v2 BlueZ 4/4] android: Add variable ROOT_PATH to Android.mk Luiz Augusto von Dentz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox