android: remove bluetooth-headers

The Android build system discourages from copying headers.
Besides, it's incorrect to do actions in the make shell function.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

diff --git a/android/Android.mk b/android/Android.mk
index f4c5323..7498c34 100644 (file)
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -101,9 +101,6 @@ LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 LOCAL_SHARED_LIBRARIES := \
        libglib \
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_TAGS := optional
 
 # for userdebug/eng this module is bluetoothd-main since bluetoothd is used as
@@ -247,9 +244,6 @@ LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 LOCAL_SHARED_LIBRARIES := \
        libglib \
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := mcaptest
@@ -282,9 +276,6 @@ LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 LOCAL_SHARED_LIBRARIES := \
        libglib \
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := bneptest
@@ -317,9 +308,6 @@ LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 LOCAL_SHARED_LIBRARIES := \
        libglib \
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := avdtptest
@@ -369,9 +357,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := btmon
@@ -487,9 +472,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := l2test
@@ -512,7 +494,6 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(LOCAL_PATH)/bluez \
-       $(LOCAL_PATH)/bluez/lib \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
@@ -563,9 +544,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := btmgmt
@@ -591,9 +569,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := hcitool
@@ -619,9 +594,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := hciconfig
@@ -646,9 +618,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := l2ping
@@ -673,9 +642,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := avtest
@@ -707,9 +673,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := hciattach
 
@@ -799,25 +762,6 @@ include $(BUILD_EXECUTABLE)
 endif
 
 #
-# bluetooth-headers
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := bluetooth-headers
-LOCAL_NODULE_TAGS := optional
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-
-include_path := $(local-intermediates-dir)/include
-include_files := $(wildcard $(LOCAL_PATH)/bluez/lib/*.h)
-$(shell mkdir -p $(include_path)/bluetooth)
-$(foreach file,$(include_files),$(shell cp -u $(file) $(include_path)/bluetooth))
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(include_path)
-
-include $(BUILD_STATIC_LIBRARY)
-
-#
 # avtest
 #
 
@@ -833,9 +777,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := avinfo
@@ -861,9 +802,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
-LOCAL_STATIC_LIBRARIES := \
-       bluetooth-headers \
-
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 LOCAL_MODULE_TAGS := debug
 LOCAL_MODULE := rctest

diff --git a/bluetooth b/bluetooth
new file mode 120000 (symlink)
index 0000000..7951405
--- /dev/null
+++ b/bluetooth
@@ -0,0 +1 @@
+lib
\ No newline at end of file