Add missing libbluetooth in linker commands for executables using libbluetoothd.
Change-Id: I7b3b94c1262867b997a3c995f55e4ddfe4dfd343
diff --git a/compat/Android.mk b/compat/Android.mk
index 62e0974..ceff2dc 100755
--- a/compat/Android.mk
+++ b/compat/Android.mk
@@ -21,6 +21,7 @@
LOCAL_SHARED_LIBRARIES := \
libbluetoothd \
+ libbluetooth \
libcutils
LOCAL_MODULE_TAGS :=
diff --git a/test/Android.mk b/test/Android.mk
index a819def..897264f 100755
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -19,7 +19,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -44,7 +44,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -69,7 +69,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -95,7 +95,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -146,7 +146,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -171,7 +171,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -196,7 +196,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -225,7 +225,7 @@
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd \
+ libbluetoothd libbluetooth
LOCAL_STATIC_LIBRARIES := \
libglib_static \
@@ -260,6 +260,7 @@
LOCAL_SHARED_LIBRARIES := \
libbluetoothd \
+ libbluetooth \
libc \
libcutils
@@ -290,7 +291,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -315,7 +316,7 @@
$(LOCAL_PATH)/../src
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
diff --git a/tools/Android.mk b/tools/Android.mk
index 004c947..241616d 100755
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -17,7 +17,7 @@
$(LOCAL_PATH)/../src \
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -42,7 +42,7 @@
$(LOCAL_PATH)/../src \
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE:=sdptool
@@ -68,7 +68,7 @@
$(LOCAL_PATH)/../src \
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -94,7 +94,7 @@
$(LOCAL_PATH)/../src \
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -116,7 +116,7 @@
$(LOCAL_PATH)/../src \
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
@@ -145,7 +145,7 @@
$(LOCAL_PATH)/../src \
LOCAL_SHARED_LIBRARIES := \
- libbluetoothd
+ libbluetoothd libbluetooth
LOCAL_MODULE:=hciattach
