Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: 88f21b8e1c am: 54fcaa9259 am: fef3293bca am: 54ce7a8aa1 am: 20a388f29e
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1866353
Change-Id: Ic7ff6d9ddd23f4945386ee2f0758992a107f7c82
diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk
index 7b55e16..cd1bb84 100644
--- a/msm8909/libbt-vendor/Android.mk
+++ b/msm8909/libbt-vendor/Android.mk
@@ -45,7 +45,7 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
external/bluetooth/bluedroid/hci/include \
- system/bt/hci/include \
+ packages/modules/Bluetooth/system/hci/include \
$(TARGET_OUT_HEADERS)/bt/hci_qcomm_init
ifeq ($(BOARD_HAS_QCA_BT_AR3002), true)
diff --git a/msm8909w_3100/libbt-vendor/Android.mk b/msm8909w_3100/libbt-vendor/Android.mk
index 38ae94d..a7ef019 100644
--- a/msm8909w_3100/libbt-vendor/Android.mk
+++ b/msm8909w_3100/libbt-vendor/Android.mk
@@ -43,7 +43,7 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
external/bluetooth/bluedroid/hci/include \
- system/bt/hci/include \
+ packages/modules/Bluetooth/system/hci/include \
$(TARGET_OUT_HEADERS)/bt/hci_qcomm_init
ifeq ($(BOARD_HAS_QCA_BT_AR3002), true)
diff --git a/msm8960/libbt-vendor/Android.mk b/msm8960/libbt-vendor/Android.mk
index 66c5873..e95d9af 100644
--- a/msm8960/libbt-vendor/Android.mk
+++ b/msm8960/libbt-vendor/Android.mk
@@ -20,7 +20,7 @@
include $(CLEAR_VARS)
-BDROID_DIR:= system/bt
+BDROID_DIR:= packages/modules/Bluetooth/system
LOCAL_SRC_FILES := \
src/bt_vendor_qcom.c \
diff --git a/msm8992/libbt-vendor/Android.mk b/msm8992/libbt-vendor/Android.mk
index 822515e..30db158 100644
--- a/msm8992/libbt-vendor/Android.mk
+++ b/msm8992/libbt-vendor/Android.mk
@@ -20,7 +20,7 @@
include $(CLEAR_VARS)
-BDROID_DIR:= system/bt
+BDROID_DIR:= packages/modules/Bluetooth/system
LOCAL_SRC_FILES := \
src/bt_vendor_qcom.c \
diff --git a/msm8996/libbt-vendor/Android.mk b/msm8996/libbt-vendor/Android.mk
index 5d3a956..1f30791 100644
--- a/msm8996/libbt-vendor/Android.mk
+++ b/msm8996/libbt-vendor/Android.mk
@@ -20,7 +20,7 @@
include $(CLEAR_VARS)
-BDROID_DIR:= system/bt
+BDROID_DIR:= packages/modules/Bluetooth/system
LOCAL_SRC_FILES := \
src/bt_vendor_qcom.c \
@@ -48,7 +48,7 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
external/bluetooth/bluedroid/hci/include \
- system/bt/hci/include \
+ packages/modules/Bluetooth/system/hci/include \
$(TARGET_OUT_HEADERS)/bt/hci_qcomm_init
ifeq ($(BOARD_HAS_QCA_BT_AR3002), true)
diff --git a/msm8998/libbt-vendor/Android.mk b/msm8998/libbt-vendor/Android.mk
index 74570c5..bc08458 100644
--- a/msm8998/libbt-vendor/Android.mk
+++ b/msm8998/libbt-vendor/Android.mk
@@ -44,7 +44,7 @@
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
external/bluetooth/bluedroid/hci/include \
- system/bt/hci/include \
+ packages/modules/Bluetooth/system/hci/include \
$(TARGET_OUT_HEADERS)/bt/hci_qcomm_init \
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
