2014-01-16 14:52:24

by Andrzej Kaczmarek

Subject: [PATCH 1/2] android: Add btmgmt to debug builds

---
android/Android.mk | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)

diff --git a/android/Android.mk b/android/Android.mk
index 7e97ec8..b3e6a50 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -282,3 +282,39 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := bluetoothd-snoop

include $(BUILD_EXECUTABLE)
+
+#
+# btmgmt
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ ../tools/btmgmt.c \
+ ../monitor/mainloop.c \
+ ../lib/bluetooth.c \
+ ../lib/sdp.c \
+ ../src/eir.c \
+ ../src/glib-helper.c \
+ ../src/shared/io-mainloop.c \
+ ../src/shared/mgmt.c \
+ ../src/shared/queue.c \
+ ../src/shared/util.c \
+
+LOCAL_C_INCLUDES := \
+ $(call include-path-for, glib) \
+ $(call include-path-for, glib)/glib \
+ $(LOCAL_PATH)/.. \
+ $(LOCAL_PATH)/../src \
+ $(LOCAL_PATH)/../lib \
+
+LOCAL_SHARED_LIBRARIES := \
+ libglib \
+
+LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE := btmgmt
+
+include $(BUILD_EXECUTABLE)
--
1.8.5.2

2014-01-21 12:56:06

by Johan Hedberg

Subject: Re: [PATCH 1/2] android: Add btmgmt to debug builds

Hi Marcel,

On Thu, Jan 16, 2014, Marcel Holtmann wrote:
> > android/Android.mk | 36 ++++++++++++++++++++++++++++++++++++
> > 1 file changed, 36 insertions(+)
> >
> > diff --git a/android/Android.mk b/android/Android.mk
> > index 7e97ec8..b3e6a50 100644
> > --- a/android/Android.mk
> > +++ b/android/Android.mk
> > @@ -282,3 +282,39 @@ LOCAL_MODULE_TAGS := optional
> > LOCAL_MODULE := bluetoothd-snoop
> >
> > include $(BUILD_EXECUTABLE)
> > +
> > +#
> > +# btmgmt
> > +#
> > +
> > +include $(CLEAR_VARS)
> > +
> > +LOCAL_SRC_FILES := \
> > + ../tools/btmgmt.c \
> > + ../monitor/mainloop.c \
> > + ../lib/bluetooth.c \
> > + ../lib/sdp.c \
> > + ../src/eir.c \
> > + ../src/glib-helper.c \
> > + ../src/shared/io-mainloop.c \
> > + ../src/shared/mgmt.c \
> > + ../src/shared/queue.c \
> > + ../src/shared/util.c \
> > +
> > +LOCAL_C_INCLUDES := \
> > + $(call include-path-for, glib) \
> > + $(call include-path-for, glib)/glib \
> > + $(LOCAL_PATH)/.. \
> > + $(LOCAL_PATH)/../src \
> > + $(LOCAL_PATH)/../lib \
> > +
> > +LOCAL_SHARED_LIBRARIES := \
> > + libglib \
>
> have Johan fix the dependency on GLib instead. It should not be needed anymore.

btmgmt is now free of GLib so Andrzej is free to send a new patch for
the Android build.

Johan

2014-01-16 22:08:27

by Marcel Holtmann

Subject: Re: [PATCH 1/2] android: Add btmgmt to debug builds

Hi Andrzej,

> android/Android.mk | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/android/Android.mk b/android/Android.mk
> index 7e97ec8..b3e6a50 100644
> --- a/android/Android.mk
> +++ b/android/Android.mk
> @@ -282,3 +282,39 @@ LOCAL_MODULE_TAGS := optional
> LOCAL_MODULE := bluetoothd-snoop
>
> include $(BUILD_EXECUTABLE)
> +
> +#
> +# btmgmt
> +#
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_SRC_FILES := \
> + ../tools/btmgmt.c \
> + ../monitor/mainloop.c \
> + ../lib/bluetooth.c \
> + ../lib/sdp.c \
> + ../src/eir.c \
> + ../src/glib-helper.c \
> + ../src/shared/io-mainloop.c \
> + ../src/shared/mgmt.c \
> + ../src/shared/queue.c \
> + ../src/shared/util.c \
> +
> +LOCAL_C_INCLUDES := \
> + $(call include-path-for, glib) \
> + $(call include-path-for, glib)/glib \
> + $(LOCAL_PATH)/.. \
> + $(LOCAL_PATH)/../src \
> + $(LOCAL_PATH)/../lib \
> +
> +LOCAL_SHARED_LIBRARIES := \
> + libglib \

have Johan fix the dependency on GLib instead. It should not be needed anymore.

Regards

Marcel

2014-01-16 14:52:25

by Andrzej Kaczmarek

Subject: [PATCH 2/2] android: Add l2ping to debug builds

---
android/Android.mk | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

diff --git a/android/Android.mk b/android/Android.mk
index b3e6a50..d2009d7 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -318,3 +318,25 @@ LOCAL_MODULE_TAGS := debug
LOCAL_MODULE := btmgmt

include $(BUILD_EXECUTABLE)
+
+#
+# l2ping
+#
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ ../tools/l2ping.c \
+ ../lib/bluetooth.c \
+ ../lib/hci.c \
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/../lib \
+
+LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE := l2ping
+
+include $(BUILD_EXECUTABLE)
--
1.8.5.2