diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:08:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:08:59 +0000 |
commit | 36734ae8e1e53ae5e95e371486921cc5487a9a5d (patch) | |
tree | 03a55c2f5edd301106d53bd97d9e42e66c9d2673 | |
parent | 29c8a55bb6e521089ebd80a64afc893f8822aad2 (diff) | |
parent | 2bf063f3221818100d147f812048c081bb4eee77 (diff) | |
download | bt-android13-mainline-mediaprovider-release.tar.gz |
Snap for 8570526 from 2bf063f3221818100d147f812048c081bb4eee77 to mainline-mediaprovider-releaseaml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020android13-mainline-mediaprovider-release
Change-Id: I337dc2866d1cade144cb05d842861cb2922aabdf
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | METADATA | 3 | ||||
-rw-r--r-- | libbt-vendor/Android.mk | 5 |
3 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,4 @@ -ifeq ($(call is-vendor-board-platform,QCOM),true) +ifneq (,$(call is-vendor-board-qcom)) ifneq ($(BUILD_WITHOUT_VENDOR),true) include $(call all-named-subdir-makefiles,libbt-vendor) endif 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/libbt-vendor/Android.mk b/libbt-vendor/Android.mk index 363a592..d85846f 100644 --- a/libbt-vendor/Android.mk +++ b/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 @@ -66,6 +66,9 @@ LOCAL_SHARED_LIBRARIES := \ libbtnv 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 |