diff options
author | Bob Badour <bbadour@google.com> | 2021-02-05 23:09:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 23:09:20 +0000 |
commit | 6153db47aee62c36e9fd4d66d798848139ca83f6 (patch) | |
tree | 5cf47fabffe9164d2ca3b48b5bf310bbec9e7632 | |
parent | b2bf4623c7f5bcafcc33cb826f6ff29aa739163f (diff) | |
parent | 4d5a1a528372a9bd1d86aa478431732619ff23d1 (diff) | |
download | bt-6153db47aee62c36e9fd4d66d798848139ca83f6.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/bt" am: cad29fea63 am: 00bfb074de am: 4d5a1a5283android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-s-v2-preview-1
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/bt/+/1576085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f6cbf936016cf379396c9f13d27ae9c231cc3db
-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 |