From 58693ff2d8edcc41c6124f5823fccdb5d652f8a4 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 1 May 2020 08:23:40 -0700
Subject: Add METADATA to bt: Apache2+BSD=NOTICE

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I3566cd697efb21b4526476254e72c3c6ea627df8
---
 METADATA | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
-- 
cgit v1.2.3


From d347d31575fe64ce601629f6804d8596c28ad579 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Wed, 3 Feb 2021 18:13:57 -0800
Subject: [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt

Added SPDX-license-identifier-Apache-2.0 to:
  msm8960/libbt-vendor/Android.mk

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    legacy_not_a_contribution
to:
  msm8909/libbt-vendor/Android.mk
  msm8909w_3100/libbt-vendor/Android.mk
  msm8992/libbt-vendor/Android.mk
  msm8996/libbt-vendor/Android.mk
  msm8998/libbt-vendor/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ib07f49be6e284639ced42e175babc653e5c33c26
---
 msm8909/libbt-vendor/Android.mk       | 3 +++
 msm8909w_3100/libbt-vendor/Android.mk | 3 +++
 msm8960/libbt-vendor/Android.mk       | 3 +++
 msm8992/libbt-vendor/Android.mk       | 3 +++
 msm8996/libbt-vendor/Android.mk       | 3 +++
 msm8998/libbt-vendor/Android.mk       | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk
index d9b6e0f..7b55e16 100644
--- a/msm8909/libbt-vendor/Android.mk
+++ b/msm8909/libbt-vendor/Android.mk
@@ -64,6 +64,9 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 #LOCAL_CLANG := false
 LOCAL_CXX_STL := none
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8909w_3100/libbt-vendor/Android.mk b/msm8909w_3100/libbt-vendor/Android.mk
index e299f89..38ae94d 100644
--- a/msm8909w_3100/libbt-vendor/Android.mk
+++ b/msm8909w_3100/libbt-vendor/Android.mk
@@ -62,6 +62,9 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
diff --git a/msm8960/libbt-vendor/Android.mk b/msm8960/libbt-vendor/Android.mk
index 0337d89..66c5873 100644
--- a/msm8960/libbt-vendor/Android.mk
+++ b/msm8960/libbt-vendor/Android.mk
@@ -38,6 +38,9 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
diff --git a/msm8992/libbt-vendor/Android.mk b/msm8992/libbt-vendor/Android.mk
index e5ae9f1..822515e 100644
--- a/msm8992/libbt-vendor/Android.mk
+++ b/msm8992/libbt-vendor/Android.mk
@@ -66,6 +66,9 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
diff --git a/msm8996/libbt-vendor/Android.mk b/msm8996/libbt-vendor/Android.mk
index ba89348..5d3a956 100644
--- a/msm8996/libbt-vendor/Android.mk
+++ b/msm8996/libbt-vendor/Android.mk
@@ -71,6 +71,9 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
diff --git a/msm8998/libbt-vendor/Android.mk b/msm8998/libbt-vendor/Android.mk
index 2bb2283..74570c5 100644
--- a/msm8998/libbt-vendor/Android.mk
+++ b/msm8998/libbt-vendor/Android.mk
@@ -70,6 +70,9 @@ LOCAL_HEADER_LIBRARIES := \
         libutils_headers
 
 LOCAL_MODULE := libbt-vendor
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
-- 
cgit v1.2.3


From 5cb844a1ac2e700bd95d14adc84059da85f9b5f2 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 21 Oct 2021 00:33:57 +0000
Subject: Fix include path for system/bt

BUG: 196026708
Test: TH
Change-Id: I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2
---
 msm8909/libbt-vendor/Android.mk       | 2 +-
 msm8909w_3100/libbt-vendor/Android.mk | 2 +-
 msm8960/libbt-vendor/Android.mk       | 2 +-
 msm8992/libbt-vendor/Android.mk       | 2 +-
 msm8996/libbt-vendor/Android.mk       | 4 ++--
 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
 
-- 
cgit v1.2.3


From e63951d871902b051f92a02ddecb5369871c4004 Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Wed, 20 Oct 2021 18:00:49 -0700
Subject: Replace is-vendor-board-platform with is-vendor-board-qcom.

Bug: 201477826
Test: treehugger

This change has been generated by the following script:

```
#! /bin/bash
declare -r files="$(grep -rlP '^[^#]*call +is-vendor-board-platform' --include '*.mk')"
[[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF"
s/ifeq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifneq (,$(call is-vendor-board-qcom))/
s/ifneq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifeq (,$(call is-vendor-board-qcom))/
EOF
) $files
```

Change-Id: Icf36f2b3df82619064a248985b5970dbd0b29009
---
 msm8909w_3100/Android.mk | 2 +-
 msm8998/Android.mk       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msm8909w_3100/Android.mk b/msm8909w_3100/Android.mk
index cd2c3ae..53dea9f 100644
--- a/msm8909w_3100/Android.mk
+++ b/msm8909w_3100/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(call is-vendor-board-qcom))
 include $(call all-named-subdir-makefiles,libbt-vendor)
 endif # is-vendor-board-platform
diff --git a/msm8998/Android.mk b/msm8998/Android.mk
index cd2c3ae..53dea9f 100644
--- a/msm8998/Android.mk
+++ b/msm8998/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(call is-vendor-board-qcom))
 include $(call all-named-subdir-makefiles,libbt-vendor)
 endif # is-vendor-board-platform
-- 
cgit v1.2.3


From 40c33b4e0c3404380dfdb0e19ae7e6e899e4388e Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 21 Oct 2021 00:33:57 +0000
Subject: Fix include path for system/bt

BUG: 196026708
Test: TH
Merged-In: I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2
Change-Id: Iba40982fbc388e5f8afb147a247400d02b169b0d
---
 msm8909/libbt-vendor/Android.mk       | 2 +-
 msm8909w_3100/libbt-vendor/Android.mk | 2 +-
 msm8960/libbt-vendor/Android.mk       | 2 +-
 msm8992/libbt-vendor/Android.mk       | 2 +-
 msm8996/libbt-vendor/Android.mk       | 4 ++--
 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
 
-- 
cgit v1.2.3


From 7bd960337eec667790b106834d16b1ad23c24de6 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Thu, 21 Oct 2021 00:33:57 +0000
Subject: Fix include path for system/bt

BUG: 196026708
Test: TH
Merged-In: Iba40982fbc388e5f8afb147a247400d02b169b0d
Merged-In: I9e52ba532ae1444190cbf18103fa4e1b0f76d1b2
Change-Id: Ic2324edb34497ae658b7abba3a51c9bb6705ecd6
---
 msm8909/libbt-vendor/Android.mk       | 2 +-
 msm8909w_3100/libbt-vendor/Android.mk | 2 +-
 msm8960/libbt-vendor/Android.mk       | 2 +-
 msm8992/libbt-vendor/Android.mk       | 2 +-
 msm8996/libbt-vendor/Android.mk       | 4 ++--
 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
 
-- 
cgit v1.2.3