android/build: Create a target for hciconfig.
PATCH 1/1 android/build: Create a target for hciconfig.
--- android/Android.mk | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
android/Android.mk +33 -0
@@ -539,6 +539,39 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac include $(BUILD_EXECUTABLE) # +# hciconfig +# + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + bluez/lib/bluetooth.c \ + bluez/lib/hci.c \ + bluez/tools/csr.c \ + bluez/tools/csr_h4.c \ + bluez/tools/hciconfig.c + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/bluez \ + $(LOCAL_PATH)/bluez/lib \ + $(LOCAL_PATH)/bluez/tools \ + $(LOCAL_PATH)/bluez/src \ + $(LOCAL_PATH)/bluez/src/shared \ + +LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS) + +LOCAL_STATIC_LIBRARIES := \ + bluetooth-headers \ + +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE := hciconfig + +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac + +include $(BUILD_EXECUTABLE) + +# # l2ping #
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Marcel Holtmann
maintainerHi Ian,
Quoted 12 lines
---
android/Android.mk| 33 +++++++++++++++++++++++++++++++++1 file changed, 33 insertions(+)android/Android.mk +0
-0@@ -539,6 +539,39 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac include $(BUILD_EXECUTABLE) #
android/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac · line 551
Quoted 10 lines
android/Android.mk +10
-0+# hciconfig +# + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + bluez/lib/bluetooth.c \ + bluez/lib/hci.c \ + bluez/tools/csr.c \ + bluez/tools/csr_h4.c \
are you sure about this csr_h4.c file? I do not think that it is needed.
android/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac · line 552
Quoted 1 line
android/Android.mk +1
-0+ bluez/tools/hciconfig.c
Also could you re-order these similar to hcitool.
android/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac · line 559
Quoted 6 lines
android/Android.mk +6
-0+LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/bluez \ + $(LOCAL_PATH)/bluez/lib \ + $(LOCAL_PATH)/bluez/tools \ + $(LOCAL_PATH)/bluez/src \ + $(LOCAL_PATH)/bluez/src/shared \
The entry for hcitool gets away with just $(LOCAL_PATH)/bluez and I assume that is enough here as well.
Quoted 4 lines
android/Android.mk +4
-0+ +LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS) + +LOCAL_STATIC_LIBRARIES := \
android/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac · line 573
Quoted 10 lines
android/Android.mk +10
-0+ bluetooth-headers \ + +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE := hciconfig + +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac + +include $(BUILD_EXECUTABLE) +
Everything else looks just fine. On a side note, we never included the command so far since mostly everything can be done with btmgmt. Especially when it comes to qualification. Then again, I have no objections to include hciconfig since that command is more widely know as it seems.
Regards
Marcel
PATCH v2 1/1 android/build: Create a target for hciconfig.
Changes:
- Remove unnecessary source and includes.
- Reorder source dependencies for similarity.
PATCH 1/1 android/build: Create a target for hciconfig.
--- android/Android.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
android/Android.mk +28 -0
@@ -539,6 +539,34 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac include $(BUILD_EXECUTABLE) # +# hciconfig +# + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + bluez/tools/hciconfig.c \ + bluez/tools/csr.c \ + bluez/lib/bluetooth.c \ + bluez/lib/hci.c \ + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/bluez \ + +LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS) + +LOCAL_STATIC_LIBRARIES := \ + bluetooth-headers \ + +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE := hciconfig + +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac + +include $(BUILD_EXECUTABLE) + +# # l2ping #
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Szymon Janc
AppliedHi Ian,
Quoted 33 lines · On Monday 02 of February 2015 00:25:29 Ian Coolidge wrote:
--- android/Android.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)android/Android.mk +21
-0@@ -539,6 +539,34 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac include $(BUILD_EXECUTABLE) # +# hciconfig +# + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + bluez/tools/hciconfig.c \ + bluez/tools/csr.c \ + bluez/lib/bluetooth.c \ + bluez/lib/hci.c \ + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/bluez \ + +LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS) + +LOCAL_STATIC_LIBRARIES := \ + bluetooth-headers \ + +LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) +LOCAL_MODULE_TAGS := debug
android/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac · line 572
Quoted 10 lines
android/Android.mk +7
-0+LOCAL_MODULE := hciconfig + +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/bluez/configure.ac + +include $(BUILD_EXECUTABLE) + +# # l2ping #
Applied, thanks.
Signature · 2 lines
Best regards, Szymon Janc