diff options
author | Baligh Uddin <baligh@google.com> | 2021-11-06 18:48:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-06 18:48:31 +0000 |
commit | ee4c6b0a8a48f1f5601e46d1a9531ae745262848 (patch) | |
tree | e4d571a75fc99f2f2bf59c4f0d6a82f30a63b9f1 | |
parent | 54fcaa9259f0fe2758c93be6b69170429565fe84 (diff) | |
parent | 41aa18c779f105a75736af860001fc42f23deb1b (diff) | |
download | bt-ee4c6b0a8a48f1f5601e46d1a9531ae745262848.tar.gz |
Merge "Fix include path for system/bt" am: 41aa18c779android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1883512
Change-Id: Iff31c0cb8ddbba75ab3b7746da7d0aa06707c814
-rw-r--r-- | msm8909/libbt-vendor/Android.mk | 2 | ||||
-rw-r--r-- | msm8909w_3100/libbt-vendor/Android.mk | 2 | ||||
-rw-r--r-- | msm8960/libbt-vendor/Android.mk | 2 | ||||
-rw-r--r-- | msm8992/libbt-vendor/Android.mk | 2 | ||||
-rw-r--r-- | msm8996/libbt-vendor/Android.mk | 4 | ||||
-rw-r--r-- | msm8998/libbt-vendor/Android.mk | 2 |
6 files changed, 7 insertions, 7 deletions
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 @@ endif 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 @@ endif 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 @@ ifneq ($(BOARD_HAVE_BLUETOOTH_QCOM),) 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 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_QCOM),true) 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 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_QCOM),true) 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 @@ endif 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 @@ endif 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 |