diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 22:23:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 22:23:18 +0000 |
commit | 94032480ef09ef82d979c0f65269823f8653d63b (patch) | |
tree | a16b150223709f499f46a3bd9641d368953f38c1 | |
parent | 6f3728e58c0206c65ed50a0d69cc6d605a5c3a4c (diff) | |
parent | ca7e0edec9b0818a7dd12dd8310601c070b1af77 (diff) | |
download | adhd-94032480ef09ef82d979c0f65269823f8653d63b.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/adhd" am: f60d1d125b am: ca7e0edec9
Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1588227
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b946566cb6a457e33decaf23deef0943775301a
-rw-r--r-- | Android.bp | 52 | ||||
-rw-r--r-- | audio_streams/Android.bp | 9 | ||||
-rw-r--r-- | cras/client/cras-sys/Android.bp | 9 | ||||
-rw-r--r-- | cras/client/libcras/Android.bp | 9 | ||||
-rw-r--r-- | cras/src/Android.bp | 10 |
5 files changed, 89 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..4cb9810f --- /dev/null +++ b/Android.bp @@ -0,0 +1,52 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["external_adhd_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// +// large-scale-change included anything that looked like it might be a license +// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc. +// +// Please consider removing redundant or irrelevant files from 'license_text:'. +// See: http://go/android-license-faq +license { + name: "external_adhd_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-LGPL", + ], + license_text: [ + "LICENSE.SUPERFASTHASH", + "LICENSE.UTLIST", + "LICENSE.WEBKIT", + "NOTICE", + ], +} diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp index bf168750..2909b544 100644 --- a/audio_streams/Android.bp +++ b/audio_streams/Android.bp @@ -1,5 +1,14 @@ // This file is generated by cargo2android.py --run --device --test --global_defaults=crosvm_defaults --dependencies. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_adhd_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_adhd_license"], +} + rust_defaults { name: "audio_streams_defaults", defaults: ["crosvm_defaults"], diff --git a/cras/client/cras-sys/Android.bp b/cras/client/cras-sys/Android.bp index f7b0ff12..d6482b2e 100644 --- a/cras/client/cras-sys/Android.bp +++ b/cras/client/cras-sys/Android.bp @@ -1,5 +1,14 @@ // This file is generated by cargo2android.py --run --device --test --global_defaults=crosvm_defaults --dependencies. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_adhd_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_adhd_license"], +} + rust_defaults { name: "cras-sys_defaults", defaults: ["crosvm_defaults"], diff --git a/cras/client/libcras/Android.bp b/cras/client/libcras/Android.bp index 70c92742..aecb27a2 100644 --- a/cras/client/libcras/Android.bp +++ b/cras/client/libcras/Android.bp @@ -1,5 +1,14 @@ // This file is generated by cargo2android.py --run --device --test --global_defaults=crosvm_defaults --dependencies. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_adhd_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_adhd_license"], +} + rust_defaults { name: "libcras_defaults", defaults: ["crosvm_defaults"], diff --git a/cras/src/Android.bp b/cras/src/Android.bp index 070e6cae..17b9919a 100644 --- a/cras/src/Android.bp +++ b/cras/src/Android.bp @@ -1,3 +1,13 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_adhd_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + // SPDX-license-identifier-LGPL + default_applicable_licenses: ["external_adhd_license"], +} + cc_library_static { name: "libcras", |