diff options
| author | Mahesh Kumar Sharma <smahesh@codeaurora.org> | 2015-06-17 17:38:25 -0700 |
|---|---|---|
| committer | Chiou-Hao Hsu <chsu@codeaurora.org> | 2015-07-07 18:41:38 -0700 |
| commit | 4a50201874177e0b5d031bbcb4489e5394e94e4d (patch) | |
| tree | 9d7ddd26c18b884a9ccdaf092fadea37fd129e18 | |
| parent | 9cc0d561ff9e582ed917dff3afa6ef1fd665f468 (diff) | |
| download | android_hardware_qcom_bt-4a50201874177e0b5d031bbcb4489e5394e94e4d.tar.gz android_hardware_qcom_bt-4a50201874177e0b5d031bbcb4489e5394e94e4d.tar.bz2 android_hardware_qcom_bt-4a50201874177e0b5d031bbcb4489e5394e94e4d.zip | |
Bluetooth: Modify the make file with correct paths.
In M-release bluedroid stack is moved to system/bt/ directory.
Changed the make file accordingly in order to build the project
and avoid compilation errors.
Change-Id: I3d7ce7c7e6a89d107de1c47515d7d6dbd1121f6f
| -rw-r--r-- | libbt-vendor/Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk index 3414909..21b6102 100644 --- a/libbt-vendor/Android.mk +++ b/libbt-vendor/Android.mk @@ -20,7 +20,6 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_QCOM),true) include $(CLEAR_VARS) -BDROID_DIR:= external/bluetooth/bluedroid LOCAL_SRC_FILES := \ src/bt_vendor_qcom.c \ @@ -41,7 +40,8 @@ endif LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/include \ - $(BDROID_DIR)/hci/include \ + external/bluetooth/bluedroid/hci/include \ + system/bt/hci/include \ $(TARGET_OUT_HEADERS)/bt/hci_qcomm_init ifeq ($(BOARD_HAS_QCA_BT_AR3002), true) @@ -63,10 +63,17 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE_OWNER := qcom +ifdef TARGET_2ND_ARCH +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +else +LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) +endif + LOCAL_CFLAGS += -DBT_NV_SUPPORT #LOCAL_CFLAGS += -DREAD_BT_ADDR_FROM_PROP -include $(LOCAL_PATH)/vnd_buildcfg.mk +#include $(LOCAL_PATH)/vnd_buildcfg.mk include $(BUILD_SHARED_LIBRARY) |