diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 18:48:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 18:48:22 +0000 |
| commit | afac1cd565f24b3ade39baf0eb3dfd38c6ecf21c (patch) | |
| tree | b014a84aabf132058c101768fed2da00ad776b6b | |
| parent | 25370d2632dd8b26a1350e202ca42f798a093c04 (diff) | |
| parent | 101a228f5635dcbbf979da5d8b105c775f616f16 (diff) | |
| download | sonivox-afac1cd565f24b3ade39baf0eb3dfd38c6ecf21c.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sonivox" am: 6a91ad6c10 am: 101a228f56
Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/1588943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I923458dc39817830e0a43ecb0485e925fcd0fc86
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | arm-wt-22k/Android.bp | 19 | ||||
| -rw-r--r-- | test/Android.bp | 9 |
3 files changed, 43 insertions, 2 deletions
@@ -1 +1,18 @@ +package { + default_applicable_licenses: ["external_sonivox_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_sonivox_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + subdirs = ["arm-wt-22k"] diff --git a/arm-wt-22k/Android.bp b/arm-wt-22k/Android.bp index 8afe313..32c32ca 100644 --- a/arm-wt-22k/Android.bp +++ b/arm-wt-22k/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["external_sonivox_arm-wt-22k_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "external_sonivox_arm-wt-22k_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "libsonivox-defaults", srcs: [ @@ -143,5 +160,3 @@ cc_library { "-DJET_INTERFACE", ], } - - diff --git a/test/Android.bp b/test/Android.bp index 78246ee..4ce7e85 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -14,6 +14,15 @@ * limitations under the License. */ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_sonivox_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["external_sonivox_license"], +} + cc_test { name: "SonivoxTest", gtest: true, |