diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-05 21:46:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 21:46:34 +0000 |
| commit | 00bfb074de871885cdf0de174aa541ac6f2d0120 (patch) | |
| tree | 5cf47fabffe9164d2ca3b48b5bf310bbec9e7632 | |
| parent | 51367c5406660867f24821cf64b447a58830cfb6 (diff) | |
| parent | cad29fea6300744548eb17125b245a88f8a47e94 (diff) | |
| download | bt-00bfb074de871885cdf0de174aa541ac6f2d0120.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1576085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5a13209d000d1e1aefb2881b1104eeb481cc47a
| -rw-r--r-- | msm8909/libbt-vendor/Android.mk | 3 | ||||
| -rw-r--r-- | msm8909w_3100/libbt-vendor/Android.mk | 3 | ||||
| -rw-r--r-- | msm8960/libbt-vendor/Android.mk | 3 | ||||
| -rw-r--r-- | msm8992/libbt-vendor/Android.mk | 3 | ||||
| -rw-r--r-- | msm8996/libbt-vendor/Android.mk | 3 | ||||
| -rw-r--r-- | msm8998/libbt-vendor/Android.mk | 3 |
6 files changed, 18 insertions, 0 deletions
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 |