diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:08:49 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:08:49 +0000 |
commit | 897e92f1b8dfef27b6a2de2cd6478fb08191f199 (patch) | |
tree | e4d571a75fc99f2f2bf59c4f0d6a82f30a63b9f1 | |
parent | a3c96a5d88745d872ee672b42cb288742cd200b3 (diff) | |
parent | 79ece28f29bf9b49a6527daf3e50f80d31065243 (diff) | |
download | bt-android14-mainline-mediaprovider-release.tar.gz |
Snap for 8570526 from 79ece28f29bf9b49a6527daf3e50f80d31065243 to mainline-mediaprovider-releaseaml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020android14-mainline-mediaprovider-releaseandroid13-mainline-mediaprovider-release
Change-Id: I318d9bd9ab92a809ae7e93cf6c277a036473eb46
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | msm8909/libbt-vendor/Android.mk | 5 | ||||
-rw-r--r-- | msm8909w_3100/Android.mk | 2 | ||||
-rw-r--r-- | msm8909w_3100/libbt-vendor/Android.mk | 5 | ||||
-rw-r--r-- | msm8960/libbt-vendor/Android.mk | 5 | ||||
-rw-r--r-- | msm8992/libbt-vendor/Android.mk | 5 | ||||
-rw-r--r-- | msm8996/libbt-vendor/Android.mk | 7 | ||||
-rw-r--r-- | msm8998/Android.mk | 2 | ||||
-rw-r--r-- | msm8998/libbt-vendor/Android.mk | 5 |
9 files changed, 30 insertions, 9 deletions
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 +} diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk index d9b6e0f..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) @@ -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/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/msm8909w_3100/libbt-vendor/Android.mk b/msm8909w_3100/libbt-vendor/Android.mk index e299f89..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) @@ -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..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 \ @@ -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..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 \ @@ -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..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) @@ -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/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 diff --git a/msm8998/libbt-vendor/Android.mk b/msm8998/libbt-vendor/Android.mk index 2bb2283..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 @@ -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 |